I think that the fighter's armor mastery needs one additional category: No Armor.
These fast moving individuals focus on being where the weapon isn't...something that fighters are supposed to be good at.
Fantasy is full of nimble unarmored fighters...look at Robin Hood, Porthos, Athos, and Aramis, and real people such as Cyrano De Bergerac and other swashbuckling folk. (And every fighter-mage will benefit as well..)
