**Baptism does NOT save.**
1Peter 3:20,21.......is that from heaven, or of men.
It appears you are trying to be cute by half and it’s not working for you. I think you need to restudy all those verses again and look closely at the Greek words and their intent.