The solution is to break up China into many smaller states like what happened with the former Yugoslavia.
Once the mainland Tiongs are busy fighting or enslaving one another, they won't bother other countries or take umbrage at them for the most trivial things.