If you can get a legacy Kaoms, I would. I think a Legacy one is like +1500ish HP over a normal one at lvl 100 and some HP nodes.
Can you get an item with 2% mana leech so that mana isn't a problem?
10k is not bad solo (just not so hot in groups -- obviously you can't compete with DPS glass cannon builds, but such is the life of a tank).
Your tree is fine, other than I wouldn't have gone down the "Thick Skin" route (see my latest tree for reference).
Melee is getting some love in Act 4 -- it will be interesting to see what happens. Apparently crit is getting adjusted some, too.