How to solve it? Reunify the Koreas.
That will keep them both occupied for a while worrying about that one, because they both do everything they can to keep it from happening. Might be kicking the problem down the road I realize, and would probably make all parties up their militarization.
Imagine having a third major player in the region that's not necessarily beholden to Japan or China.