A Riven Fix that ISN'T meant to gut her

Hi, I'm gonna make this short and sweet: Riven's E is why she's broken because it makes her too safe. The ult speed nerf is a good place to start, but here's my take on how to fix her. (Read: not nerf to oblivion)

• Move the dash mechanic from her shield (E) to her stun (W) Why: With this change, Riven now has to decide if she wants to hard engage by jumping into the enemy team to stun them, or dash away to safety, wasting her stun to do so. Like this, catching Riven is easier, as she can't stun you, jump three times, and dash while also gaining a shield. With just a little CDR, she becomes nigh uncatchable, but this change forces her to choose between stunning her pursuers or putting more distance between her and them.

• Change the 100% Bonus AD scaling on her shield (E) to EITHER 1) 30% AP scaling OR 2) 5% of her Bonus HP Why: The reasons for this one are pretty obvious. No other shield in the game scales on AD, and since that's Riven primary (perhaps only) stat that she needs to itemize for, changing the scaling on her shield needs to happen. As mentioned above, being able to build damage and get tanky for it make her too safe, especially with CDR when she can mitigate massive amounts of damage or outright outrun any chasers. Lots of Riven's already build a little tanky (Randuin's/Banshee's), so the HP scaling makes the most sense, since it is a stat that she will actually use.

What do you guys think? The goal is to accentuate her strengths (High damage/high mobility/strong in teamfights) and her weaknesses (Relative squishiness/weak 1v1) without harming or eliminating her core principles. Riven mains; do you feel that this change fundamentally hurts her identity? Riven haters; does this nerf her enough to be combatable?