Rap, I don't think everyone with OCD necessarily has obsessions and compulsions both; I think you can have one and not the other but it is an anxiety thing rather than a personality thing. I saw a lot of my old self in the OCPD description only I changed :-) so my rigidity couldn't have been that bad. My stuff was tied in to my relationship with my stepmother too so mostly just an untangling which I did well in therapy. But I've always been anxious so my therapist's basic thought of helping me with General Anxiety Disorder probably was fine.