The entire message is encompassed in verses 38 and 39. In all cases of compliance to Peter's message individuals do all things presented albeit in differing sequences. At no time is any part eliminated; ie, belief, repentance, water baptism or the infilling of the Holy Ghost.
The fact remains that repent and gift of the spirit are second person plural object and subject where as be baptized is third person singular as related to remission of sin, NOT the gift of the spirit,
hence in no way was the gift of the spirit a result of being water baptized
spin it however you want, it’s is teaching salvation by ones own merit not by grace to say water baptism, not spirit baptism is how one receives remission of sin