As far as I understand, dystonia is more apt to involve large muscle groups and is "more involuntary" than either tics or stims.
All that kept going through my mind while I was trying to calm and get DD1 to ER was that if we were living in the middle ages, I would have been calling a priest to request an exorcism. DD1 was completely freaked out by it, and "wanted to cut her legs off just to make it stop."
Again, it doesn't seem like what you are describing, but the Dr ordering Benadryl, suggests that's what he thinks it might be. Benadryl is great for a gazillion things, but I've never heard it suggested for stims or tics - might work though since it essentially 'relaxes' the body.