I would remove Magic and Physical Armor and replace them with Saving Throws just like D:OS1, then work on balancing stuff from there.