Kalista's Passive [Balance Suggestion]

Just looking at several of the threads posted about Kalista, it seems that the most obvious problem is the amount of mobility she is given, along with having a knock-up and slow built into her kit. Personally, I like the idea of her passive, but I believe that Riot was too "gung-ho" in implementing a new system that hadn't before been seen in the Rift, and didn't see the issues with it. With Kalista's passive being activated every time she places an auto attack, building Runaan's Hurricane and other attack speed items, make her a menace late game and a pain for immobile tanks or fighters to deal with.

My idea would be to tweak her passive along the lines of something like this.. "**Removed: **INNATE: Kalista cannot cancel her basic attack wind-up except by selecting a new attack target who's in range; and her attacks will miss if she loses sight of her target before they hit.

Every fourth basic attack, Kalista enters a movement command while winding her basic attack or Pierce, she will drive through that direction when she launches her attack, dashing a short distance. Martial Poise distance scales with Enhanced Movement, and is increased by 25% when dashing backwards."

This small edit to her passive, would still allow her to maintain a bit of the uniqueness with the mobility in her kit, while making it easier to catch up to Kalista in team fights, ganks, or duels. The reason her innate passive should be removed is due to the fact that Kalista's range wouldn't be enough to compensate for not being able to move during auto-attacks (think Xerath's trade-off of range for mobility during his Q and R). A better illustration of this would be:

http://swearingin.com/wcontent/wp-content/uploads/2014/02/AustinPowersSteamroller.gif

Do you believe that this change would begin to nurture the problems associated with the amount of mobility in Kalista's kit? Please comment below and provide feedback!