Let look at Acts 2:38 exegetically if we may. Acts 2:38-39
38 Peter said to them, " Repent (plural phrase, you all repent), and each of you be baptized in the name of Jesus Christ (singulare phrase) for the forgiveness of your sins (Plural phrase); and you will receive the gift of the Holy Spirit.
Combine the singulare phrase with the singulare and the plural withe plural phrase. This is proper exegesis.
What do we get?
“Repent … for the forgiveness of sins” (plural phrases).
"…each one of you be baptized in the nameof Jesus (singulare phrase).
The result is "you will recieve the gift of the Holy Spirit.
This verse does not teach that water baptism is needed for salvation.