What were you tanking when you were told you were too squishy?
I would suggest taking 2 points out of Cruelty and putting them into Improved Disciplines in addition to upgrading your gems.
Are you using your cooldowns proactively? I've started using mine a lot.
If things look dicey at all, Last Stand + Enraged Regeneration. Shield Wall is still there if I think I need it.