Biminblue, I also wanted to say, your post about a sober mind being a calmer mind rings so true right now. I notice that I do feel calmer daily; my mind isn't so crazy active.
I'm still going to speak to my therapist about it because I also remember a past counselor wanting to do the testing for a diagnosis since I fit the criteria and this was before I drank. However, if things continue on the same path, I'll be okay managing it with CBT and time.