Sounds beefy! I have to admit that the orc berserker/deathknight doesn't hold well at lategame. Its bonuses can't really overcome its inability to equip shields, and with body mod for strong arms the ability to swing a two-hander plus have extra evasion and counterattacks is just too good. And I'm in a similar boat, unless I'm going up against bonkers boss battles my frontliners are only taking chip damage, so the other body mod options just don't hold up.
Also I've totally slept on the upgrades system until now, wish I'd been cranking out legendary quality iron gear back in early game.