I think maybe one thing you should ask is, what difference would either diagnosis make? I mean, if they are learned behaviour, this is something thats been drilled into since childhood and therefore will take a lot of hardwork to stop doing. If it is OCD then obviously meds can help, but I'm sure if you think you have OCD and take meds, then psychologically you may change your behaviour too, if any of that makes sense?
Sorry, I don't know too much about OCD but this what I've said can be true for other phychological problems.