Is removing Rengar's 'ferocity expires our of combat' a possibility?

is easily my favorite champion in the game, and while getting his old q back sounds like a very satisfying and enjoyable step in the right direction of making him fun to play again, one of the real core issues that arose out of the rework was making 's ferocity a resource which expires when out of combat. While I believe the intention was to make his kit a lot less spammy, it honestly wound up doing the opposite; instead of stacking up your fury on the camps and choosing the right tool for the job like you used to (pretty thematically appropriate, giving the feel of a hunter preparing for the kill,) half the time all you do now is jump out of the brush like a clumsy oaf and slam your fingers on all the buttons, praying you're facing the right direction. While the new slashy Q wasn't so bad with this new method of ganking since it didn't interrupt your movement that much making it viable to stay in combat while getting closer to the enemy, I'm already starting to imagine how awkward it's going to be having to stop and auto the closest thing to me to proc Q to give me empowered ferocity. While it would be neat to play critgar again, it feels like doing so is still keeping s kit as clunky as it was after the rework with the fact that every second counts in ganking a lane early, and wasting moments to auto a minion or some other target is just as impractical as trying to hit someone with the Slash and Stab. I propose that in addition to reverting the Q the 'ferocity expires out of combat' be removed as well, allowing Rango mains to plan out their ganks and utilize their kits more efficiently in the laning phase instead of 'jump and roll the face on the keyboard' just to get empowered ferocity. To further discourage button spamming when you finally go in for the kill, I also wanted to suggest placing all of Rengar's abilities on a short cooldown (say two or three seconds max) after using an empowered ability on an enemy champion, that way a player will have to really think which ability he really needs to catch his prey and get out alive. If anyone has any other ideas or improvements for everyone's favorite knifecat, feel free to share!

tl;dr Old rengar q is nice, but remove 'feroctiy expires out of combat' might be the bigger deal. Also maybe add short cd on all abilities when using empowered one to counteract button spamming.