I’m going to link a comment I made elsewhere, but TLDR I don’t think you can properly fix Khitanguts without also splitting the Xianwei.
–EDIT–
And just to be super clear, when I say “splitting the Xianwei” I don’t mean re-naming them. I know that’s become quite confusing the post 3K