Hi Spazzcat,
The funny (well not so funny) thing is that most of us have some symptoms from different parts of the forum. It's like the illnesses won't fit into the diagnoses, and why should they?
IMHO OCD is part of a lot of other conditions, especially the intrusive thoughts part of it.
I do the symmetry and lining up stuff, and it does make for tidy bookshelves!
Good (non intrusive) thoughts, M