Mage/Dark Wizard Help Two Builds, Need Suggestions For Improving Them.

So I made 2 mage builds.
One is a attack speed thunder build, the other is spell spam water build.
Here are the builds:
Thunder: https://wynndata.tk/s/LCGAkD
Water: https://wynndata.tk/s/ERuU07

Any suggestions for improving either build? Please make the suggestions considering a 128LE budget and no mythics (the Fatal is the only mythic I am considering saving up emeralds for)

 

Here's an improved fatal build: https://wynndata.tk/s/6AOlJy
If you don't have the fatal, you can just use hive wand with t6 thunders

And here's my version of your water build, basically all I did was replace Requiem with Hive Wand and the damage went shooting up. https://wynndata.tk/s/5ntToD

But I would honestly recommend just saving up for the fatal and using the best fatal build you can find, so you don't end up wasting a crap ton of powders on the hive wand like I did

 

here's your thunder build https://wynndata.tk/s/pb6Cni
here's your water build https://wynndata.tk/s/BDPNkV

 

Thanks a lot for the help with the builds!