I used to fidget like crazy and it was almost certainly due to my OCD. I've relaxed those symptoms quite a bit, but I have a pretty bad junk food habit when I have to write papers and that sort of thing. I think the two are somewhat connected...I just need something to do with my hands, so I eat instead of fidget, or something like that.
Good luck finding a therapist.