>> “salvation is all of grace, your awareness adds nothing to it.” <<
.
Neither does baptism. Baptism is nothing but the obedient acknowledgement of the Lord’s sacrifice that saved us.
.
St Paul had a different teaching given to him in Acts 22:16, and St Peter seems to disagree with you as well in 1 Peter 3:21.
You are following a tradition of men first taught in the 16th century, as opposed to the historical, biblical, orthodox and apostolic teaching for 2,000 years.