I don't know your drug of choice, but there are many people in my NA group whose drug of choice is alcohol, and just prefer NA to AA, or go to both. People in my group always talk about doing the "next right thing" and that sounds like what you are doing.
I am proud of you. If you are like me, than you know this stuff isn't easy.
It's also hard because I (we?) want to exhibit patience, but also make progress in the program, while overcoming doubt and fear.