No add on's ( 1 Corinthians 12 v13)

I come from Northern Ireland,not all Protestants hate Roman Catholics and vice versa,I never hated Catholics ,and I never was brought up to hate Catholics.I recently asked a young man was he a Christian,and he replied,'I am a baptised Roman Catholic',I could have replied,'I'm a baptised Protestant' If that was I was depending on I most definitely would not be a Christian. In John 3 v5 our Saviour said to Nicodemus ,'No one can enter the Kingdom of God unless they are born of water and the Spirit'.There are those who take this to mean baptisim,but it has nothing to do with water  baptisim,the whole context of the our Saviours talk was about the Spirit,water is just mentioned once.If we go to what  John the baptists said in John 1 v 33,'The one who sent me to baptise with water  told me''The man on whom you see the Spirit come down and remain is the one who will baptise you with the Holy Spirit''.We cannot have add on's in relation to being saved,be it baptism or any thing else, The scripture continually stresses that it is faith and faith alone that saves us,John 3 v16,/ Acts 16 v 31. In  Ephesians 2 v 8-9. we read ,'For it is by grace you have been saved,through faith,and this is not of yourselves,it is the gift of God.Not of works, so that no one can boast'.Baptisim comes after salvation ,it is a declaration that you are saved ,and have died to the old life, and now are going to live in newness of life in Christ.