Looks like you haven't gotten around to reading John's Gospel.
"Jesus answered: Amen, amen I say to thee, unless a man be born again of water and the Holy Ghost, he cannot enter into the kingdom of God." John 3:5
“Looks like you haven’t gotten around to reading John’s Gospel.”
The origial statement was: “In the mind of the apostles, water and spirit were not separate entities. “
Matthew clearly shows that they were indeed seperate entities. John does not dispute that.