Problems with Blitzcrank R Passive

This idea has been voiced a couple times before in various places; the most recent from Reddit was https://www.reddit.com/r/leagueoflegends/comments/3ewe2g/lets_talk_blitzcranks_ultimates_passive/ .

Blitzcrank's R passive on live is as follows:

PASSIVE: While R is not on cooldown, Blitzcrank fires a lightning bolt at a random nearby visible enemy every 2.5 seconds, dealing 100/200/300 magic damage.

This is inconvenient in two important ways:

• Walking by any jungle camp post level 6 automatically damages it, proccing aggro and causing you to lose Mobi boot's movement speed.
• It steals CS in lane when supporting. Less important, but still rather annoying.

Further fallacies:

• When a fight breaks out, it is unlikely that a player would hold on to this ability to get maximum damage out of these weak and relatively long-CD bolts.
• This ability occurs whether or not you are actually in combat, unlike Thornmail's passive. And this passive cannot be toggled unless you actually put it on cooldown (use it), which wastes some rather valuable burst or silence.
• As far as I know, Blitz was conceived as a top lane tank or fighter with high utility, so this passive made sense to give him some poke in lane. But the bolts do not even prefer champions or low-health enemies, instead simply dealing damage to a random nearby enemy.

Suggestion 1:

While R is not on cooldown While Blitzcrank is in combat, he fires a lightning bolt at a random nearby visible enemy every 2.5 seconds, dealing 100/200/300 magic damage.

This removes the random proccing when walking next to jungle camps or minions. It is a slight buff because it can trigger when R is on cooldown, but in late game with ~20% CDR, the ability is already on 24s cooldown.

Suggestion 2: Remove or rework the passive entirely to better fit Blitz's role as a support. Things I have in mind for a rework include stacking charges of movement speed when out of combat (up to +100) or giving increased mana regen when off cooldown.

Thanks for reading!