First things first: Restore all those expertise and hit reforges. If an item does not have mastery, reforge for it. Mastery is your greatest stat up to 102.4 combined avoidance/mitigation. Gems should be blue: mastery/stam, red: mastery/parry, yellow: mastery only. If the bonus is lackluster just put a mastery gem in it. That's where you can start, then we can look at spec. Honestly warriors haven't needed hit/expertise since before ICC.