Baptism is one of many Bible topics that suffers from a particular kind of blindness.
It happens most frequently to important topics. Once long ago a teacher, an honest and dedicated person, summarized that important topic in one specific way. He taught that to his followers. It became a rallying cry, then a way of differentiating themselves from everyone else. Was the teacher wrong? Not necessarily. Perhaps not at all. Yet these pithy ways of explaining complex topics are like a door-one that either opens up clarity into the text or one that closes the door to searching out the Word.
I want open doors into the Word. I think you do too. So the only thing is to lay aside what I think I know and go straight to the Bible and ask God some direct questions. You may be as surprised by the answers as I was.