Welcome Hopscotch,
I also self-medicated with alcohol to deal with anxiety/depression. I had anxiety issues since my teenage years, long before I started drinking. Drinking made the anxiety worse, much worse. Stopping drinking didn't end my anxiety issues, but now I am able to deal with the anxiety. There are a couple of books that are really helpful to deal with anxiety without medication. I think, if you stop drinking, you will find that things improve.