Last night I looked at the numbers and stuff, and in the end I don't think trying to break down the domains into a "classless" system will work. Liek you said above, the design is too tightly integrated.
That leads to new class design. What classes would be necessary for a Gammaheart game, and...