I would tend to move away from classes - perhaps just make a set of powers for each power source (martial gods, divine gods, psionic gods, etc) and let the PC's former class, race and other details of their mortal career mostly be expressed in fluff that alters the description of those powers.