I think this sounds more like Bipolar II AND ADHD. I mean, its possible to have both. What you described sounds like me when I'm hypomanic. Its a less severe form of mania, but I do get a few psychotic features whereas you don't.
I have ADD with one feature of ADHD (restlessness, fidgeting).
But one thing you need to understand, is that you are not your diagnosis.
I was misdiagnosed as schizoaffective for four years, and treated as if I was schizophrenic. Which I didn't understand, because I wasn't hearing voices or having psychotic impulses, just heard music under certain triggers and suffered some paranoia regarding paranormal activity. Those were the only psychotic feature and no medication ever completely got rid of the music. But since they told me I was schiz, I thought, well, I must be. Even though I didn't match the cases I studied in psychology classes in college and high school. But I was Bipolar Type II. How did I find out? I did a psychological evaluation by a psychologist. My advice is to get that done ASAP. That will let you really know what's going on. Just keep in mind, the testing just addresses recent behavior within the past 3 months, thoughts and feelings. It isn't 100% accurate. It said I'm schizoid but I'm not, however the other three diagnoses were very accurate. My therapist and psychiatrist agreed with them and said they made perfect sense. So if you can get a referral to such an exam, it would be very beneficial.
But it can also be painful. Reading it was very hard and it broke my heart at first. Acceptance is something that comes with time, and it isn't easy. But once you know what you're dealing with, you can make a plan of action for treatment and coping. That's half the battle right there.
I am honestly grateful to be bipolar instead of schizophrenic. Letting go of the stigma of so many years, and the pain of carrying that diagnosis around. Plus, my favorite superhero is Bipolar Type I with ADHD. It is possible to have a happy life with this mental illness.