One of my old suggestions was to have draw function as is whilst you have charges, but change it to a GCD when you are out of charges.

Not the easiest thing to balance, but personally I'd take it over what we have right now.