Kelptomancy and champions with built in on-hit abilities

So this is kind of a basic request, can Riot please do something about and 's ability to proc this keystone off their respective Q abilities. I don't know if that just means putting a super small delay between ability used and keystone being active, or somehow changing the ability to not work as as a typical on hit effect. I love the idea of cast spell and follow it up with an auto attack to proc the keystone, but think it's a little insane that certain champions can get the effect simply from the spell cast alone. This is made worse by the two mentioned offenders due to the high level of damage that their abilities do and the very low cooldown those abilities have. Keeping in mind that Kelpto remains active for a few seconds after ability usage AND only has a 2 second cooldown between use.

Hell i'm even fine with those champions being able to trigger the effect with the ability, BUT they have to cast something before hand. This would allow them to still use the keystone but not be able to abuse it's power.