I'm in the middle of diagnosis. I do have Bipolar and have been medicated for 4 years or so. My shrink and I suspect that ADHD is there. It seems to be a common comorbidity. I was self-medicating with alcohol, until I got to a very bad place.
Both bipolar and ADHD have a frightening percentage of substance abuse, often as a form of self medication.
I went to the shrink around the time when I got sober. Quitting drinking and meds literally saved my life.
BTW, I got sober thanks to SMART Recovery. SMART is science based and behavior oriented, so even if you don't have an addiction problem (substances and/or behaviors), You can learn a lot of stuff applicable to behavioral problems. Much of the program is based on Cognitive Behavioral therapies, no higher power required. Confidential. Free.