The only things I'd add to the OP would be:

- (MCH) Make Flamethrower generate heat.
- (SMN) Move Elemental Mastery to the level 61-70 range instead