I haven’t finished reading through the thread yet, so if this has already been addressed then I apologize, but I had to comment on this.
Let’s look at what St. Peter says in this passage:
For Christ also suffered for sins once, the righteous for the sake of the unrighteous, that he might lead you to God. Put to death in the flesh, he was brought to life in the spirit. In it he also went to preach to the spirits in prison, who had once been disobedient while God patiently waited in the days of Noah during the building of the ark, in which a few persons, eight in all, were saved through water. This prefigured baptism, which saves you now. It is not a removal of dirt from the body but an appeal to God for a clear conscience, through the resurrection of Jesus Christ, who has gone into heaven and is at the right hand of God, with angels, authorities, and powers subject to him.
(1 Peter 3:18-22)
How can you say that St. Peter is not talking about water baptism when he expressly connects “baptism, which saves you now” to the story of Noah’s ark, in which eight people “were saved through water”? He explicitly states that this event, where eight people “were saved through water” prefigured baptism. If he is not talking about water baptism as you claim, he sure picked the most misleading and confusing way possible to “not talk about water baptism” by referencing an event in which people were saved through water–actual water that flooded the earth for 40 days, not water in the sense of a spiritual metaphor.