Ezreal needs a small rework; and I got an idea

I've been looking through the lower end Winrate champs (even with those with a lot of experience) And EZ is still behind and quite outdated... nut o don't think he is all that behind the curve.

I had an idea of replacing his W and was wondering what everyone thinks since this is his most lack luster ability... even though my idea semi conflicts with his current passive.

Essence Flux Capacitor (W):

Passive: Ezreals Basic attacks deal 10/15/20 (based on level) bonus magic damage on hit and 15% of magic damage ezreal deals is converted to true damage.

Active: Ezreal gains 5/10/15/20/25% attack speed and on hit effects damage increase by the same amount for 4 second or until he casts Q.

Mystic Shot (Q): New effect Castings Mystic Shot while W is active empowers this ability making it deal double damage from On Hit Effects as Magic damage.

It'll add more build options, more strength to AD and AP ezreal and more skill expression.

What y'all think?

I was thinking alternatively of having his W just empower on hit effects by a slightly larger margin and not granting attack speed making him pack more of a punch after building attack speed with Q, getting some hard hits off and then crush them with a Q with massive on hit damage.