Well I don’t see any conflict or disharmony, if that’s what you’re asking.
Some might see a disharmony between faith saving us (Eph. 2:8) and baptism saving us (I Peter 3:21). Yet they see no conflict between faith saving us (Eph. 2:8) and grace saving us (Eph. 2:8). The disharmony is all in their minds, not the Scriptures.
If we’re saved by grace, by the blood of Jesus, and instructed to have faith, what shall we do? If we’re told to confess, will we resist? If we’re commanded to repent, will we oppose? If we’re told to be baptized, will we refuse?
Which of God’s instructions will we disobey and still expect Him to forgive us?
1 Peter 3 is quite fascinating, in it is an intriguing reference to some of what Christ was doing after death and with reference to the flood. Have you ever tried reading the Amplified Bible? It doesn’t flow (and Psalms wouldn’t be much fun), but it does offer clarity.
“21 And baptism, which is a figure [of their deliverance], does now also save you [from inward questioning and fears], not by the removing of outward body filth [bathing], but by [providing you with] the answer of a good and clear conscience (inward cleanliness and peace) before God [because you are demonstrating what you believe to be yours] through the resurrection of Jesus Christ.”
We are under new management, so yes, we obey God, but it is important to understand that our salvation rests not on this but on the redemption offered by God. A “figure” is a representation of something else, and that is vitally important to remember.