These can be good solutions. I prefer the first option.
But why would frantic still be a gambling weapon? As someone mentioned earlier (I don't know how to quote from the previous page), as an e-m item, simply give it slightly lower damage than spartan with the same energy and heat cost. Then no one would complain, and frantic users could still use this creative weapon.