State of Flicker Strike

So I've been thinking about one of the most iconic skills in PoE-History, Flicker Strike.

It's in a weird state right now. It's basically useless without charged staff. And that's not even the worst part about it. The worst part is:

You actually need to generate power charges with a long chore, just to not be able to use the skill that shall define your build.

My solution:

Make flicker strike be able to use any charge you can generate and depending on the charge expended it gets static bonuses. Like for example endurance charge fire flat damage, frenzy charge flat cold damage and power charge flat lightning damage.

Also it should be able to generate at least some charges by itself. Maybe with a cooldown, but now it just feels weird.

You do things to get things that you then can spend to use skills... Weird...

Any other ideas, guys?