Archer/Hunter Help Lvl 97-endgame Archer Build

I've been spending quite some time in the Builder over on WynnData, but I can't seem to create a build I'm completely happy with. My old build (https://wynndata.tk/s/h7f4ps) is heavily thunder/spell based and I would like to keep it that way if possible.
I've tried multiple different things from a 100% earth/main attack build (https://wynndata.tk/s/0hts3l) to still more thundery (https://wynndata.tk/s/xsiqml) and even a completely hybrid-ish thing (https://wynndata.tk/s/dh5e09), but all of them are lacking in some way.

If anything my current build fits my playstyle really well so I would like the new one to be as simillar to it as possible.
Please no mythics and no Hive items as the Hive is what I mainly need an improved build for...

Any help would be greatly appreciated, as well as feedback on how good the builds above are, since I'm not that great at making them I feel :)

 

thunder arrow storm build no hive items
https://wynndata.tk/s/r1etua

 

Thanks! This is pretty much what I was looking for