You are correct that Acts 10 (Household of Cornelius) and Acts 19 (Paul and Believers) is "flipped" which means God wants all Believers to be water baptized but Salvation and the Holy Spirit baptism is NOT dependent on the timing of water baptism.
Acts 10 - Gentile Believers received Holy Spirit baptism then, water baptism.
Acts 19 - Believers that were NOT at Pentacost believed in Jesus Christ and were water baptized but, had not received the Holy Spirit baptism yet... until Paul layed his hands on them and prayed.
On one occasion, while he was eating with them, he gave them this command:
“Do not leave Jerusalem, but wait for the gift my Father promised, which you
have heard me speak about. For John baptized with water, but in a few days
you will be baptized with the Holy Spirit.” Acts 1:4-5
One Lord, one faith, one baptism.
Ephesians 4:5
How many baptisms do you want?