Here is my egregious suggestion which *GASP* Reduces Depth And Choice:

Merge Leadership into the Charisma ability. Ta-da! It combines one skill only useful in combat with one skill only useful in non-combat into one skill useful for both!