Indeed, one pain point of unicode is CJK unification.
https://heistak.github.io/your-code-displays-japanese-wrong/
They should add separate code points for each variant and at least make it possible to avoid the problem in new documents. I've heard the arguments against this before, but the longer you wait, the worse the problem gets.
Chinese textbook: <ch>Chinese <jp>Mixed Japanese</jp> continue Chinese.</ch>