As much as it pains me to say, I would strongly consider a loladin or 5th shammy over warrior in most situations.