Warrior/Knight Help An Alkatraz Build As Similar To This As Possible

I bought an Alkatraz almost a year ago, and the build worked fine. But after 1.20 released, I'm guessing because of balancing changes, the build no longer works. Even with the exact same skill points and items.

So yeah, I now need a new Alkatraz build, I had absolutely no issues with the old build and I loved it. So I would appreciate a build as similar to it as possible. High DPS around 40k, at least 10k health, and I would appreciate decent defense.
conditions:
no mythics (other than alka of course)
no crafted
preferably no raid stuff

my old build, to build the new one off of: https://wynndata.tk/s/nb680z

thanks
- Torpid

 

defensive (efa)
https://wynnbuilder.github.io/#5_0K60ZS0kT0720BK0BK0K40uH0QJ2M-s-s1V0q1g00000
WynnBuilder build:
> Pride of the Aerie
> Tisaun's Valor
> Second Wind
> Burnout
> Flashfire Knuckle
> Flashfire Knuckle
> Prowess
> Recalcitrance
> Alkatraz []

offensive (etf)
https://hppeng-wynn.github.io/#5_0Ba07N0X90VN0OG0BK0BI0uH0QJ2M0q-n1A-t1g00000
WynnBuilder build:
> Kindled Orchid
> Calidade Mail
> Physalis
> Nether's Scar
> Diamond Fiber Ring
> Flashfire Knuckle
> Flashfire Gauntlet
> Recalcitrance
> Alkatraz []