you have a very interesting take on 1 Peter 3:21, the only problem with it is it goes against the Apostolic Faith the Church has taught and believed for 2,000 years.
can you name one person that had a correct understanding of baptism from your perspective between 95ad when John died and the 16th century and the appearance of the Anabaptists on the world scene? anybody?
If the only baptism is water, and baptism saves, then all the wicked in Noah's day will be in heaven.
Set aside what that "Church" has been teaching for, as you say, 2,000 years, and LOOK, LOOK, OPEN THE PAGES AND LOOK, at 1 Peter 3:21.
WHO GOT WET ????? WHO, IN NOAH'S DAY, IN THAT PASSAGE, GOT BAPTIZED ????
Okay, I'll help you. The WICKED. The UNSAVED. Those WHO REJECTED THE TRUTH. They were all baptized in a watery judgment.
WHO WAS SAVED BY WATER ???
I'll help you again. Believers, eight of them, on an ark, WHO NEVER GOT WET; WERE NEVER IMMERSED, POURED ON, DAMPENED; THEY STAYED DRY.