You sound like you have more like what I do, which is OCDsorta. My therapist says I meet the criteria but only barely and only in a kind of twisted way so I don't really have it but I'm so close that I still need treatment at times. We've done a lot of CBT and it is more controlled than it used to be. It can be hard for me to sort out what is hypomanic thinking and what is the OCDsorta and so he kind of watches for when I am stuck and he helps me sort the 2 out. It's sort of hard to explain and I can't think of an example but it is something we've worked on for a long time.