Don't know if you read this part of the post:
Born of water is mentioned a single time in their discussion. A befuddled Nicodemus asks Jesus:
How can a man enter a second time into his mother’s womb?
Concerning that natural birth, Jesus teaches:
Except a man be born of water and of the spirit, he cannot enter into the Kingdom of God. That which is born of the flesh is flesh, and that which is born of the spirit is spirit.
Jesus is here drawing a contrast between two births…not encouraging a new, two-part birth. The fleshly birth from a nine month amniotic sac, is not enough Nicodemus. You must be born again. It is the Lord himself making the argument here; that born of water, and born of the flesh, are synonymous terms. Paul echoes the same argument in Galatians; as does Peter, in his comparison between corruptible seed, and incorruptible seed.
So no, water and spirit are NOT clearly seen to be the emphasis of Jesus in
John 3. Spirit...and Spirit baptism are His emphasis.