Cleon
Legend
The main changes, as I see 'em, will be:
- Boosting Dex and/or Cha instead of Str (incorporeal) and Con (both)
- Improving deflection bonus rather than natural armor (incorporeal)
- Boosting undead-specific attacks (energy drain, ability camage, etc.)
- The manueverability should not drop for incorporeal creatures
I'm thinking some of those should be folded in the standard template.
Ability damage (which is +1 letter better than ability camage

I'd rather add Energy Drain and other attacks to the Increased Damage ability too. My first though was simply doubling the energy drain, like we double the Gargantua's regeneration and fast healing. That could get rather nasty though...

Similarly, we could say the flying manoeuvrability remains unchanged for creatures that fly using (Su) or (Sp) means, including incorporeal creatures.