Just combine the benefits of Martial Adept and Weapon Master into a single feat - as part of learning how to use martial weapons, the character learns a couple of maneuvers to use in combat. And whether Martial Adept comes with one superiority die or two would be a question of balance.
