Ok, major overhaul.

Swapped Run for Martial Weapon in prereqs.

Gave Resistance a swap out option as a Full Round action.

Moved Swift Charge to 5th.

Added Energy Substitution as a bonus feat at 2nd, 4th, 6th, and 8th.

Nerfed ALL abilities to so that only elements that have been mastered (Energy Sub) are selectable.