On reflection; a Barbarian (war cry) would probably add quite a bit of survivability. Alternatively; if you could drop the cooldown reducer (or another passive) for one with everything.