Shaco's Two-Shiv Poison (E) change suggestion

First of all, I don't mind if they change it back to how it was but in case they want sth new, instead of just buffing stats...

How about making Two-Shiv Poison a skillshot?

Of course it wouldn't be a guaranteed hit anymore, which is a reason to buff the ability, at least in terms of range and/or stats. I'm not entirely confident to suggest the stats but personally, I'd like it to have a strong base dmg (increase with leveling), while giving it a decreased percentage from AD/AP, just to make the player feel rewarded from landing a hit, without being too dependent on items. As for the range, maybe as far as Nidalee can throw her Q-spear is enough (maybe even less). Another thought is to increase the speed of throwing shivs scale with his AP and to increase the dmg scale with AD (without making it undodgeable with the speed, unless 1.2k AP :P).

In addition, since he's holding two shivs, maybe he could have 2 in-store for throwing (much like Vi's E ability) before a total cooldown, hence fulfilling the name "Two-Shiv". That way, it's passive (slowing down with basic attacks) might be a bit more impactful. However, I feel an adjustment on the total cooldown should be needed for this to be balanced. A personal preference on the effects, is to make him apply Grievous Wounds with basic attacks on passive and slow poison with active/throwing. The idea is that he likes to play with his victims, so he tries to catch them if they run away and decrease their chance to survive when he hits them from upclose. This can also fulfill the name Two-Shiv Poison, through the two different poison effects, hence cancelling the 2 in-store idea.

Finally, since his Q is nerfed early game, it would be difficult for Shaco to go in stealth mode and make sure to land a Shiv but it would somewhat increase his late game impact, so nothing changes from what Riot intends to do (weak early game - strong late game).

As an ending note, this would increase Shaco's overall skill cap but it would also give enemies a counterplay without taking away the Assassin burst (again Riot intentions).

Thoughts?

PS. Have you guyz seen that in the new client Two-Shiv Poison scales with 100% AD and 90% AP? Typo or possible future buff?