Both water and Spirit are involved in the NT rebirth conversion
That is not water baptism. If it were, it would require every single believer throughout history to be baptized with water in order to be saved. If being born of the Spirit is necessary then so is water. The reality is many were never baptized with water.
You misunderstand the points made about 1 Peter. The flood event, the dying of the sinful, foreshadows the NT water baptism reality;
No I don't and no it doesn't. It foreshadows the reality we have when baptized with the Spirit. It is talking about how the flood foreshadowed the death to sin and new life we have in Christ. That reality can only be obtained through the work of the Holy Spirit. Water simply will not do that, it has no power to do that.
In water baptism, it is the Spirit of God that brings about the reality He promised when man chooses to believe and obey the command.
The baptism of Cornelius shows us water is unnecessary. He died to sin and was raised to life before Peter baptized him with water. The Spirit does His work on the authority of Christ, not the authority of men.
And I'll leave you with this. One baptism, something you have never addressed.