What makes you think "water" means baptism?
Water and it’s regenerative qualities are mentioned many times in Scripture, beginning with Genesis.
God regenerated the world from sin by causing a flood, saving only Noah and his family, whom he deemed righteous.
During Exodus God parted the Red Sea, allowing the Israelites to flee the Egyptians.
During the wandering God caused Moses to strike a rock, bringing life giving water to the Israelites.
Jesus Himself, who was without sin, was baptized by John the Baptist. As he was baptized, the Holy Spirit appeared as a dove and the clouds parted, God stating “This is My Beloved Son, with whom I am well pleased.” (BTW, this baptism was not needed except as an example of what Jesus wanted us to do, much in the same way as the Eucharist).
When Jesus was pierced on the cross, blood and water gushed from his side.
In Revelation, St. John speaks of Jesus having a voice like “living waters”.
As much as I am enjoying this debate, I have to get ready for Bible Study, ironically, and I’m Catholic.