Jesus said "born of water and the Spirit" not born of baptism and the Spirit. In John 4:10,14; 7:37-39, Jesus talks about "living water" and connects it with eternal life.
In John 4:10,14 Jesus is explaining to the Samaritan woman that HE is the Living Water.
In John 3:5 Jesus says that one must be born of water and spirit. So are you saying Jesus is the water?
-----------------------------------------------------------------------------------------
In John 7:37-39 Jesus says that streams of living water will flow out of those who believe in Him.
verse 39 clearly states that the Living Water is the Holy Spirt, which had not yet been given since Jesus was not glorified.
The Living Water is the Holy Spirit.
Joel 2:28 God will pour out His Spirit just like the Living Waters will pour out of those who believe in Jesus.
John 1:33 The one coming AFTER John the Baptist will baptize with the Holy Spirit.
And, in fact, this is what happens in Acts 2:15-17
Acts 2:15-17 New International Version (NIV)
15 These people are not drunk, as you suppose. It’s only nine in the morning!
16 No, this is what was spoken by the prophet Joel:
17 “‘In the last days, God says,
I will pour out my Spirit on all people.
Your sons and daughters will prophesy,
your young men will see visions,
your old men will dream dreams.
The people were elated at having received the Holy Spirit...Peter was telling the crowd that they were not drunk.
We can safely say that in John 3:5 Jesus did not mean this Living Water that you mention.
It's accepted by all theologians that Jesus either meant:
Natural Birth
or
Baptism
Also, Jesus DID say that we are to be baptized.