Yes, all magic armor above those minimum enhancement bonus requirements are assumed to be masterwork, and yes, 4E math takes those bumps into account. The bumps are there to ensure that heavy armor wearers remain competitive with light-armor wearers, who get to add their Dex/Int bonus to AC...