Please provide a updated version of your build if it is possible to you.
Well, I think it’s time to me to update this Physical Blademaster
I already got several Warborns from Bosses
And currently I’m puzzling with non Soldier Physical Damage, may be now the time for Warborn and Cadence 
I made a build similar to TZ’s post xpac, you can check it out: https://www.grimtools.com/calc/aZqG7642.
You may want to swap Belgothian’s Carnage for Oleron since I was too lazy to craft another one.
25s Mad Queen: https://www.youtube.com/watch?v=O8iVSW5_2l8
Interesting devotion choice, War Cry will trigger Ulo Cleansing Water for nullification Mad Queen Aura 