Read in context...Jesus was answering Nicodemus. Being born of the water is the birth from your mother's womb.

John the baptizer in Matthew 3:11
I baptize you with water for repentance, but after me will come One more powerful than I, whose sandals I am not worthy to carry. He will baptize you with the Holy Spirit and with fire.

We all are from a womb. Why would Christ even say this and be Baptized if it wasn’t needed to enter Heaven. Because to enter the Kingdom of God you 1st must be Saved and 2nd Baptized as a knowing adult in the water to wash away your sins and filt.

If not by faith alone how do you explain what Christ said to the thief on the cross?

This was spoken by Christ and is in the Book of John 3:5

There is so much controversary regarding salvation and baptism. Many preachers/churches have watered the process down. But if you read the scriptures you can clearly see the steps outlined. 1. Hearing the word, 2. Believing. 3. Repenting of our sins. 4. Confessing our faith in Christ. 5. Baptism - immersed in water - not being an infant, but having reached the age of accountability. 6. Remaining faithful in our daily walk.
Many scripturas state this. Not enough space to write it all out. But this link will clearly show the steps with some scriptures. We need to seek our own salvation and not rely on what man says. Upon judgement day we will be held accountable of what WE have done or not done, we cannot BLAME it on anyone else. Also those that have mislead so many will have their own extra punishment...again all of this is in the scriptures.
https://northsidehillsboro.com/about/what-must-i-do-to-be-saved

Agree with you as you are on target.

then what do you do with Ephesians4:5 "One Lord, One Faith, One Baptism"and 1 Corinthians 12:13 "For by one Spirit we were all baptized into one body, whether Jews or Greeks, whether slaves or free, and we were all made to drink of one Spirit."

Clearly He is talking about spirit baptism NOT water baptism. The thing to understand about the baptismal ceremony done by John & then later by the disciples, It was done because of the Jewish people being cleansed and prepared for their Messaiah. Then God chose Paul to go to the Gentiles & Paul even says he thanks God that he has only baptized a few. If water baptism were necessary for salvation then Paul was clearly not in the will of God & everything he wrote needs to be ignored. But we can't do that because Paul is the most prolific writer in the New Testament & pastors depend on Paul's writings. There is clearly a change of God's plan when He chose Paul to go to the Gentiles. It can't be dismissed.

❤️🎯🔥🙌🕊️