Energy blade crit cyclone raider

Greetings, I've been tinkering with the new energy blade gem and have achieved... something. With some random rares and a few uniques thrown together the build seems to have decent survivability, but I feel the damage is definitely lacking. I've compensated for the new gem changes and some masteries that does not work in the PoB. Any inputs on how to increase damage without sacrificing too much survivability? Feel free to tinker around with better items and gems. Tried trickster but it seems just worse than raider.

https://pastebin.com/5gJvmE3X
Raider lvl 91
414k cyclone dps on shaper
4351 life
1158 ES
34500 evasion
5000 armor
40% block
25% spell block
80% spell suppression