The Weapon Master Fighter could have some kind of Performance- based feat that allows some Charisma bonuses in battle.