Here's an idea - maybe a lot of the martial feats should be general feats, and you should get more general feats. In their place, you could put in powers for martial characters, fueled by Spell Points (call them Stamina points or whatever for martials).
This would transition the generic combat bits that anyone should be able to learn to a more common pool, while giving fighters/rogues/etc more unique options that would be fun to play.
One good example would be the old Warrior's Spirit advanced weapon training option from PF1. Spend a stamina point to either add one of a list of properties or a +1 enhancement to a weapon. Successive iterations of the ability could provide large bonuses/unlock more properties.
In fact, using the advanced weapon and armor training options as martial powers could be a good start.
Alternatively, go with something like hte 3.5 Tome of Battle - that would be really cool.