I thank you for posting that.
All in all, I see it this way.... In fact, as you posted, "God did it right the first time". I feel my baptism is completely valid, I have fufilled this commandment and I do rejoice in the fact that I was baptized as a baby. That seems special to me, knowing Christ...