Meh. Just remove Flex and rule that a PC that doesn't want to take advantage of weapon mastery gets a +1 damage. It's, mostly, an irrelevant amount anyway, especially for classes that don't get extra attack.
Then, give the longsword, an iconic weapon, a weapon mastery that's actually meaningful...