Oh no, sorry to hear you had such a horrible experience in China! Next time you travel, maybe try http://viamigo.com/ You can connect with independent tour guides all over, and converse with them before agreeing to go on one of their tours. Also, they can customize the tour to what you want to do, so you don't get stuck on such a terrible trip.

Here's the link to the China tours:

http://www.viamigo.com/tours/china.html

Hope this helps!