This is a shameless theft of a PM idea I saw a few days ago: Splitting forms into 2 parts.

The first part: Undead traits. Implimented like a monk stance.
Second Part: Specific form traits. How forms are now.

The first could be unlocked upon getting PM 1, 2 or 3, whenever it would be balanced and make sense. The second is unlocked normally.