I actually wound up taking out Windfury. I think I replaced it with two Doomhammers. (I had to disenchant a lot of good stuff to make that!) I think I was thinking the same thing as you. I don't have a lot of stuff that can survive hitting twice.

I'm also having some mixed feelings about the totemic mights too. On the one hand, it lets me keep a totem out for a turn until I can put stuff on. But on the other hand, I find that a lot of people are able to kill my stuff anyway with some combos or other, so any essential totem is going to die quickly anyway.