I have autism (HFA), ADHD, and OCD. I do tics, stims, and compulsive movements. The difference between them is this: the stims are usually involuntary or not noticed until I stop doing them (at least physical movement stims). Often when I stim, my mind is off elsewhere - I'll be thinking about something deeply and not noticing what is around me.
The compulsive movements are things I feel like I -must- do, or it feels like something bad will happen or everything will go wrong unless I do them - as illogical as I know that is - I know that doing the movements or not has no actual bearing on how things will go.
The tics are more similar to the compulsive movements. I feel an urge to do them, sometimes weak, sometimes strong. They're different from the compulsive movements in that I don't feel like bad things will happen if I don't do them - they're also smaller movements involving fewer/smaller muscles.
The stims come from my autism, the compulsive movements from my OCD, and the tics could come from either or neither, or both.
I think what you're doing is probably a stim because it sounds pretty complex, and a lot of my physical stims are pretty complex. For example, one of the main ones I do involves me putting the backs of my hands up to the sides of my face, arms cocked up and wiggling my fingers.