GangPlank Question and or auto rework

Gangplank q Gangplank takes aim and shoots an enemy unit with his pistol. If Parrrley deals a killing blow, he gains extra gold and half the Mana cost is refunded. Gangplank shoots a target unit for 20/45/70/95/120 (+100% Attack Damage) physical damage. If Parley deals a killing blow, Gangplank gains 4/5/6/7/8 extra gold and half the Mana cost is refunded. Parley can critical and applies on hit effects as if a melee basic attack.

That Is pretty easy to understand, But when you take into account his auto attack when he crits he does the same animation as his q "Without the bonus damage" and is required to be in melee range... Even when the opponent dashes in the middle of you "critical" auto attack he will stop the attack mid shot.

I understand that is is almost impossible to make it "range" because it can be abused by just spamming right click and cancel** it till you get a auto attack crit for free harass However I feel you can put a cool down like say a "Passive" on his q by stating -"every 10 second a melee chance will become range if it critical strikes" So every 10 second you can try a auto attack and see if the chances are in your favor. [If this is to strong, You can also make it so it uses the mana of a q so it balances it out]

I dont know I love gangplank doesn't feel right in lane anymore, I almost always play him jungle due to his sustain and pretty good ganks with immune to any type of cc"

Ps- I understand that even what I am stating can be abused to an exttent but as I stated I feel he need something