Like many other mental disorders, there can be cross-over symptoms (which is why it can sometimes be hard to sort out what is going on), but they are, in fact, separate disorders. That said, I have both. (And ADD. Go me! )

You'd want to speak with a professional about your specific issues, as, of course, we can't diagnose. Like with so many disorders, there are popular misconceptions that lead people towards self-diagnosis, and diagnoses from friends, which should be avoided. For instance, people think that if they think about stuff "obsessively" or are exceptionally tidy, that's "OCD". It is not. Same with BP. ALL people have ups and downs. Doesn't mean they have BP. ALL people forget stuff or have trouble focusing sometimes. Doesn't mean they've got ADD. It comes down to how pervasive something is in negatively impacting ones' life... How far off the bell curve of "normal" human experience symptoms are.
Before I veer off into a rant ....

Long/short, by all means, talk with your professional about what's going on. CBT can be helpful with all sorts of things. It's basically about examining thought patterns, and that can be useful regardless of a specific dx (or even w/o one). One other thought. Since I can't tell what kind of doctor you are referring to... GPs ("regular" doctors) are not a good resource when dealing with mental health issues. As well-intentioned as they may be, they simply don't have the level of speciality needed for such a complex subject. So be sure to seek out a mental health professional. Good luck!