Be that as it may there are only two soteriologies. Either you believe our Lord Jesus did everything in your salvation (Reform/Calvin) or you had a "free choice" in the matter (Arminian). I make the distinction because it is a matter of understanding where you are coming from. As a Calvinist I don't believe I did ANYTHING to earn/deserve my salvation including being baptized. It is asked of God and I obeyed.
"He is consistent, and to obey the Gospel, that includes being baptized for the remission of sins."
I can't argue with you on baptism because it is a sacrament of the church. However, baptism is not what save you (I know about the verse in Peter). If you're looking at baptism as an opportunity to "prove yourself" to God and believe this is what will save you, you are sadly misinformed. If you're looking at baptism as a method to identify yourself with Christ then I rejoice.
I believe in free will because that is what the Bible teaches. You said there are only two camps. Actually, that is not true. I am not Arminian because I don't believe everything the way that Arminius did. I believe how the Bible teaches, which is not exactly like Arminius or Calvin believed.
Your beliefs on baptism are not based on the teachings of the Bible. They are based on your pre-conceived ideas on Grace and salvation. I believe that the Bible is the Word of God and therefore is the only thing I need to teach me about God's Grace and salvation.
Baptism is for the remission of sins (Acts 2:38). The Greek used in Acts 2:38 is identical to the Greek used in Matthew 26:28 ,where Christ says "For this is My blood of the new covenant, which is shed for many for the remission of sins." Obviously, you would not claim that the shedding of Christ's blood was not required for salvation. However, you claim that baptism is not required, even though the language has them doing the same thing. And please don't misunderstand what I am saying. When a penitent sinner is baptized, it isn't the water magically doing anything. It is the sinner's submission to the will of Christ that causes God's blood to be applied and to remove their sins. This is not my idea, this is what the Bible itself teaches.