From my knowledge through studying the Bible and asking different but reliable people, baptism isn't required for salvation but is an act on our faith to publicly make it known that we follow Christ. So, first we have to feel conviction and ask for forgiveness and then through our own free will we accept Christ and then act on that through baptism. Right? Is that what you're saying as well?
That is correct. Except let me just say that baptism is required for salvation. It is a commandment.