It sounds like you have a good plan, tackling your drinking first. I was taught in the rooms to address the addiction most immediately detrimental to my health, and thats usually drinking.