Looking at this two years(!) later, my personal preference would be to use a system derived from Dark Sun's revised psionics, which were simpler and more unified than the CBPsi by using Mental Attack Rolls and Mental Armor Class for both psychic combat and the manifestation of powers, with each power having a set MAC. I feel it's a bit simpler, since it can use standardized terminology, and they got rid of the tangent system (replacing it with a mind being opened by either dropping to 0 PSP or being attacked while non-psionic). There are definitely some things to be updated (most of the attacks require more PSP than they deal in damage), but it's a good starting point.