Frankly, I think it is not difficult to solve the disputed territory problem with India. After all many of those are inhospitable region, they are only valuable due to strategic security reason which should not be a problem since China and India are not supposed to be enemy. The only obstacles I could see are Kashmir and Pakistan, what to do with them.