That is exactly what you are doing...You do not, you can not receive the Holy Spirit by being baptized in water...
Peter says the common element between Noah’s salvation and our salvation is water.
Wrong again...
1Pe 3:20 Which sometime were disobedient, when once the longsuffering of God waited in the days of Noah, while the ark was a preparing, wherein few, that is, eight souls were saved by water.
1Pe 3:21 The like figure whereunto even baptism doth also now save us (not the putting away of the filth of the flesh, but the answer of a good conscience toward God,) by the resurrection of Jesus Christ:
Noah was not promised a life in heaven when the rain came down...His human life was saved from drowning...
And then some might notice that this saving of Noah's life was a 'like figure' of the baptism we go thru...
And then Peter is careful and precise to tell you there is no water in this baptism:
not the putting away of the filth of the flesh
No...Our saving baptism is a spiritual baptism:
but the answer of a good conscience toward God