So; can I assume that you’ve just illustrated that a ‘proper form’ of baptism is what saves a person?
Jesus saves...but by means of the proper form of Baptism.
Say you are drowning, and I throw you a life preserver. Who saved you, me or the life preserver? Would you continue to tread water and refuse to take the life preserver because you want me to reach in and grab you with my own hand? Would you critique the way I threw it? Would you say "no, I really wanted a blue one?"
Christ saves us by His sacraments. Refuse them, and we refuse Him.