You stated a person receives the Holy Spirit the moment they believe. This is not true considering Paul's interaction with the Ephesus disciples. Also, in the same record we see Paul telling the group to be baptized in the name of the Lord Jesus. And afterward upon the laying on of hands they received the Holy Ghost. Paul's message lines up with the initial message given on the Day of Pentecost by Peter.
"There he (Paul) found some disciples and asked them, “Did you receive the Holy Spirit when[
a] you believed?” (Acts 19:1-2) Why would the Apostle Paul ask this question if a person receives the Holy Spirit the moment they believe? He would not.
And he said unto them, Unto what then were ye baptized? And they said, Unto John's baptism.
4 Then said Paul, John verily baptized with the baptism of repentance, saying unto the people, that they should believe on him which should come after him, that is, on Christ Jesus.
5
When they heard this, they were baptized in the name of the Lord Jesus.
6
And when Paul had laid his hands upon them, the Holy Ghost came on them; and they spake with tongues, and prophesied. Acts 19:3-6
I stated a person is saved, their sins forgiven, the moment they believe.
To assist you in correcting your confusion regarding water, as you continue to insist we are not saved until baptism, seek out the verses that tell you Jesus is the water of life, living water.
Born of the water and the spirit.
You forget we are not saved of ourselves. Insisting we must be baptized to be saved is not the gospel.
The gospel tells us, no one comes to Jesus unless God draws them. John 6.
47 Truly, truly, I say to you, whoever believes has eternal life. 48 I am the bread of life. 49 Your fathers ate the manna in the wilderness, and they died. 50 This is the bread that comes down from heaven, so that one may eat of it and not die. 51 I am the living bread that came down from heaven. If anyone eats of this bread, he will live forever. And the bread that I will give for the life of the world is my flesh.”
John 4:7 A woman from Samaria came to draw water. Jesus said to her, “Give me a drink.” 8 (For his disciples had gone away into the city to buy food.) 9 The Samaritan woman said to him, “How is it that you, a Jew, ask for a drink from me, a woman of Samaria?” (For Jews have no dealings with Samaritans.) 10 Jesus answered her,
“If you knew the gift of God, and who it is that is saying to you, ‘Give me a drink,’ you would have asked him, and he would have given you living water.” 11 The woman said to him, “Sir, you have nothing to draw water with, and the well is deep. Where do you get that living water? 12 Are you greater than our father Jacob? He gave us the well and drank from it himself, as did his sons and his livestock.” 13 Jesus said to her, “Everyone who drinks of this water will be thirsty again, 14
but whoever drinks of the water that I will give him will never be thirsty again. The water that I will give him will become in him a spring of water welling up to eternal life.” 15 The woman said to him, “Sir, give me this water, so that I will not be thirsty or have to come here to draw water.”