Yeah, don’t take Demo with Physical Forcewave. It’s either OK (most popular) or OC.
As for some more up-to-date builds you could compare yours with, here’s super tanky Warlord
And this is my personal standard more offensive Witchblade theorycraft that I haven’t finished/tested in-game yet
https://www.grimtools.com/calc/RVvBBkkV
Although your Commando looks pretty ok defensively, it doesn’t have Tip of Scales which both builds I’ve linked have. And also you should overcap Aether res at least a bit.
Scales with full Vitality to Physical conversion from the belt is kinda nutty ya know. Definitely incorporate that.