Found this little gem on Taobao today. Someone frankenstiened a Shineray GY7! Same engine ChinaV was talking about, with an air cooler.

http://item.taobao.com/item.htm?id=5821348378

With the new regulations out, carb bikes not legal anymore, seems I have a bike I should hold on to because getting something new is even more trouble. Changing my engine seems like a good choice now.