whip ideas

I really liked that wips where able to throw back grenades. Instead of having it now removed i would like to see it reduced.
Here some ideas:

-let majority effects the range, so for example if the majority is 50% it can throw back half of the final potential.
-don't let wips that are on fire throw back grenades
-if a whip get's shot give a delay of 0.5 second before it can throw back grenades.
-make the grenade throwing a cheap upgrade
-make the aim of throwing back less accurate