Sooo, Jesus was baptized. Think about that for a moment. Are you trying to tell me that Jesus was saved by Being dipped in water? Jesus was already God, he didn't need to be saved. So, why do it? For the same reason that people do today, to make a public statement about their faith. According to your theories, Jesus had to be transformed by being dipped in water.? Can't you see how silly that is?
How in this context Jesus could imagine that Nicodemus could have picked up from the word
water an allusion to Christian baptism is not all that clear. It wasn't even a thing yet. Moreover, in the next chapter John draws attention to the fact that Jesus himself didn’t baptize people (
John 4:2).
There were also times when Jesus declared people saved who weren't baptised.
Like Luke 7:48…49But those at the table began to say to themselves, “Who is this who even forgives sins?” 50
And Jesus told the woman, “Your faith has saved you; go in peace.”
And Luke 23:
…42Then he said, “Jesus, remember me when You come into Your kingdom!” 43
And Jesus said to him, “Truly I tell you, today you will be with Me in Paradise.”
Jesus didn't say:"Hey, Disciples, quick, pull this guy off the cross and dip him so I can save him! I just can't do it without water!"
The water from wine has nothing to do with baptism. That's a weird Catholic interpretation.
And no, Jesus didn't go baptize people. Baptism is an outward sign of an inward transformation.