Always gem for stam, and when meta comes in do dodge+stam. Enchants are always either stam, or defense ( minus a few exceptions )... The primary exception here, is that you are either way over defense cap, or under defense cap. Drop the +20 dodge, and replace with stam.
Also, move the points from Holy to ret. For ICC you're going to want the 3 points in crusader. Improved HoJ really isn't needed either. Something like [0/53/18] is a proven, and solid build.
Your echants look okay from what I can tell, replace the agility chant on your gloves with either armsman, or stam.
Just my 2 cents worth. This is how I roll, and while I'm always looking to improve, these are what I've found works well for me.