Sam, I'm glad you joined us and that you plan to stop drinking for good.
I also began drinking to self-medicate anxiety and depression. CBT is a really good plan for helping with your anxiety. I think being aware and being mindful of your feelings throughout the day is helpful in itself.
You will find lots of support here, so I hope you continue to post.