Riven Change?

Ok, so a lot of people complain about riven's damage, or CC, or extremely spammable spells that have no cost at all whatsoever.

So I was thinking, what if we gave riven energy?

She can no longer spam everything as soon as it's up, and if she does, it creates obvious windows of opportunity to jump her as soon as she has no energy. In teamfights, she can still make the flasy Q3 W hydra windslash for amazing AOE burst, but she won't be able to hop away faster than homeguard hecarim when you're chasing her, or just continually go all in in lane with you having no idea what to do because of that oh so spammable shield.