Can I suggest a simple fix?

Make it a prestige class again as it was in 3E. For the psychic warrior, with almost full power progression (say, 8/10) and most of the features condensed down to 10 levels.