Other than the polearm I don't see anything I wouldn't do myself. To answer some of your questions, if you wanna keep your T9 set bonus, I would replace something other than your helm/shoulders first and then replace one of them. If you do that you'd gain the T10 set bonus in its place. As for gemming, I personally stack STR all the way, most socket bonus' don't take the place of a 20 strength gem. Also, this should be obvious, and you have done it, but a Nightmare Tear as well. (Which you have in your helm. :]) Crit usually comes by itself for me with the gear, so I personally don't worry about it too much. 9/10
http://www.wowarmory.com/character-s...&cn=Aurexitium