Rather than fixing how the class plays. Just fix how it survives in the heat of battle. Push all supers to normal armor just like it is for defenders (out of bubble) all hunter classes and stormcallers. You are granted one hit kills. That's powerful enough. But eh. What do I know.