Need advice on my DW Soulfire Vanquisher melee templar!

https://www.grimtools.com/calc/q2M5x8r2

Hey guys can you help make my build tankier? I checked my stats and I have 0 chance to crit so i abandoned that crit idea and i want to get more defense instead. Can you help me optimize my items, like my rings, passive tree, and the devotions to make it so ? Thanks!

i have full stats on callidor tempest because i find myself spamming my right click instead of holding down righteous fervor to lifesteal so now with 5 seconds cooldown my calidor packs a punch even tho i dont spam it!