What would you take these verses to mean regarding water vs. holy spirit baptism?
Luke 3:16,
John answered, saying unto [them] all, I indeed baptize you with water; but one mightier than I cometh, the latchet of whose shoes I am not worthy to unloose: he shall baptize you with the Holy Ghost and with fire:
Acts 1:5,
For John truly baptized with water; but ye shall be baptized with the Holy Ghost not many days hence.
Do you see any indication there that holy spirit replaced the symbolic water? Water was symbolic (and many other things in the OT), you should know.
Heb 9:9-11,
9 Which [was] a figure for the time then present, in which were offered both gifts and sacrifices, that could not make him that did the service perfect, as pertaining to the conscience;
10 [Which stood] only in meats and drinks, and divers washings, and carnal ordinances, imposed [on them] until the time of reformation.
11 But Christ being come an high priest of good things to come, by a greater and more perfect tabernacle, not made with hands, that is to say, not of this building;
The words "divers washings" in verse 10 is the Greek word baptismos. Clearly it was only meant to be temporary until Jesus' death and resurrection brought the real deal. In this case, holy spirit replaced water as the medium in which one is immersed.
It's fine to get water baptized, but it will not add one whit to what you got when you believed and were baptized in holy spirit. And not getting water baptized will not subtract one thing from anyone born again, i.e. baptized in holy spirit. It's optional. It might feel good, but it really does zip as far as making us cleansed from sin. That is what holy spirit does.