Wow. The two positions are mutually exclusive, yet each of you believes the other is wrong.
That is yet another powerful indictment of the poison called sola scriptura.
Thankfully, baptism is not what saves us. God's grace alone through faith alone in His Son's redemption of us on the cross is what saves the sinner.
Grace saves, and grace alone.
And hath raised us up together, and made us sit together in heavenly places in Christ Jesus: That in the ages to come he might shew the exceeding riches of his grace in his kindness toward us through Christ Jesus. For by grace are ye saved through faith; and that not of yourselves: it is the gift of God: Not of works, lest any man should boast." -- Ephesians 2:5-9 "Even when we were dead in sins, hath quickened us together with Christ, (by grace ye are saved;)
Paul understood this concept was so important he repeated it verbatim in the span of four verses. Grace saves.