Looks good, I like the change to Armor Mastery, makes it useful all around.
Armored Defense is just such an odd duck. I'm not really sure how to fix it.
Given that the Heroic class bonus ranges are +2 at 1st, +3 at 5th, +4 at 9th, +5 at 13th, and +6 at 17th and Light and Medium armors range...