CI Arc Trapper

I have a loose final build based on Tarke's CI arc trapper: https://pastebin.com/Pt0vZ2FP

The build seems to be doing fine in early maps (and CI works pretty well so far this league), but I'm struggling with my links, or perhaps my skillbar.

Obviously this build needs some defensive work: I added a Cwdt-IC-Phase run-IncDur. I wish decoy totem still worked there, but oh well. I feel like this could be better for the build... as I normally only get hit once as I sprint away from my traps.

I've seen some builds use curse on hit with OoS, but I've found this to be extremely awkward to make useful. Also, the build struggles to keep up 6 power charges without some help. I tried OoS-PCoC-Inreased Crit-ArcSurge(low level to keep it up). This pretty much instantly fills charges, keeps up arcane surge, and is easy to cast between laying traps and them exploding.

Last issue is mana. A lot of these builds are using wrath. Combined with Discipline this just leaves me with nothing. Right now I'm running Clarity-Discipline (with both vaal skills). I feel like being able to spam traps is more important than them exploding a bit higher damage. Vaal clarity is actually quite nice for bosses when you're out of mana . However I'm quickly running out of skillbar assignments... they need to figure something out with the Vaal changes.

Am I going to be able to do end game boss dps without Wrath though? I've got a 6l Lightning spire and arc on a psuedo 5-link glove. It's overpowered in early maps, but I"m not seeing a lot of dps improvements after this.

Thanks for any advice on the final build loadout.