Warrior/Knight Help Spell Warrior

I need help making a spell warrior build i was going to use this https://wynndata.tk/s/6znif7
But warchief got nerfed.
Req for build
- 25k+ uppers 3 cost or less
- some nice mana regen (7+)( i prefer regen over steal)
I really appreciate your help!

 

25k+ uppers at 3 cost is pretty much only going to be possible with items that explicitly focus on reduction on 3rd spell coast or completely focussing the build on water damage and specing into REALLY high intelligence. But spell warrior has generally been a lot more difficult than meele lately.

 

https://wynndata.tk/s/gv6ic7 Realistically unless you go with thunder/earth brainwash getting those reqs would be super difficult that said here i did it a couple times.
https://wynndata.tk/s/xcodbv This is mana steal which I know you said you don't like as well (and I can agree...) but it works nicely with this build given you got around 14 mana steal with resonable hp, decent defenses for a thunder build, 3 mana uppers (you also can get 2 mana bashes on this build for a 5 mana upper cancel) and of course really epic damage
https://wynndata.tk/s/jnl785
https://wynndata.tk/s/bulmf1
This is my thrunda/idol dual wield I use personally. I know it doesn't fit what you want but its really good and can solo li so i figured id throw it in there.

one last thing is that as a warrior you also can use foul fairy dust and plasteel platings to craft a 1dura 10 mana sidearm ;)

 

Made 2 myself too, it might be a little bit glassy but lmk what you think
https://wynndata.tk/s/bc5qe8
28k uppers 3cost 7regen 5steal
https://wynndata.tk/s/cdwy39
28k uppers 2 cost -3regen 17steal

2nd one is even more glassy as the first