I think it's important to not only look at the "when" baptism is done or the "how" baptism is done, but the "why" baptism is done. Those arguments have been going around in circles for hundreds of years to pretty much no avail.
You need to read the Bible, ask God to guide you and make that...