Salvation, I believe, is repenting truly and with you whole heart believing that Jesus is lord. You are saved, but Santifiction is a whole other process.
God convicts you to bring you to this point. HOWEVER, it doesn't have to be at Church, God can convict you ANYWHERE, in fact he will. I know people who were in the club and God just convicted them so bad until they couldn't hold back tears in there. Salvation can happen and does happen everywhere.
Water baptism is just to show you are committed. I really don't believe you have too, but you really should do it. The thief wasn't baptisted, but yet Jesus said he would go to Heaven, so I don't believe you have to.