Rainbow Dash

[[Rainbow Dash]]

was talking with some friends and we had 2 ideas on how to errata it so it's functional for regular play :

errata 1.)

When a creature you control with flying and / or haste attacks , you get an energy counter.

{T} , pay 5 energy : Add WUBRG and draw a card.

errata 2.)

when a creature you control with flying and / or haste attacks, put a charge counter on this creature.

{T} , remove 5 charge counters from this creature : Add WUBRG and draw a card.

which errata would make for a more interesting deck?

what are some good engines to enable the payoff?

I keep thinking like [[Bitterblossom]] and [[Tempest Hawk]] but there's gotta be more right?