I think that your "Emotion" category is sort of split between my "Spirit" and "Mental" categories. My "Will" (Mental Resistance) seems to include your emotional durability; I suspect my "Creativity" (spiritual agility) includes both your emotional agility and your spiritual agility.

Why did I go for three types of things instead of four, as you did? Um, because this whole thing is me playing with the number three.