I have some of the same issues that you do and drank for many of the same reason reasons. I can only tell you that all of my symptoms have become milder and much more manageable the longer I didn't drink. It did take a while though, so just try to be patient with it and hopefully you'll see the episodes become less intense and a lot less frequent.
Wishing you all the best tonight on your new journey.