The China-US tensions are not going to get better, and, in fact, will get worse as years go by. More and more nations will be forced to choose sides. It's not good and I'm not sure what a resolution even looks like.
replies(6):
Any long term resolution to the conflict has to involve the realization that China has had 100 bad years and now has a giant comeback. And that the US has had 60 good years but now large parts of it decline.
If you want China to stop being totalitarian, then you should wait until most Chinese citizens decide that they don't approve of the ruling party, and then let them decide what to replace it with. You cannot force democracy.
In any case, you can rest assured that if the Chinese have to choose between Yeltsin and the CCP, they will choose the latter 100% of the times. Democracy cannot be forced.