1 Ptr 3:21 and baptism

1 Peter 3:20-21
vs 20 says that eight souls were saved through water.
vs 21 - says that baptism now saves us

If Peter was using the word 'save' with the same meaning, then the 'save' here has nothing to do with salvation. Noah was already a preacher of righteousness and found grace in Gods sight before the flood. The flood in no way changed Noahs relationship with God. So the same parallel should hold for baptism. Baptism should not change ones relationship with God. One must be saved like Noah before baptism/flood.

The book of 1 Ptr talks about Christians suffering. So i have a feeling the baptism that Peter is talking about is a baptism of suffering and death as mentioned by Christ in Mathew 20:23 - see vines for baptism. I believe that Peter was saying that the 'baptism of death' saves us from this wicked world and brings us into a new world through the resurrection of Christ. Because Christ lives, even though we die we shall be resurrected. And that those who hurt them will eventually be judged by Christ. 1 Ptr 3:16 tells us that those who suffer for Christ have a good conscience. I never came across this kind of interpretation for 1 Ptr 3:21. Would surely like comments on this.