Cognitive therapy and buspirone worked for me. I have GAD on top of bipolar disorder. It keeps things at bay.
Just my story, not advice.
A psychiatrist, preferably one with addiction experience, might be able to help you with whatever treatment you need. They know more than a general practitioner.