Pretty much. Seems to be the only thing I can do. I will look into seeing if I can some traffic shaping over HTTPS. At least to help aleviate the amount of bandwidth being used that can't be controlled.
I actually really admire Tor. As long as it can piss of China and Iran, then I'm fine with a small headache of trying to deal with the bandwidth problems it can cause.
