Phantom Dancer rework?

It's weird seeing champs stacking items, and this item is no exception. Maybe it could be reworked to have this:

Phantom Dancer: 40% AS 20% crit 6% MS Unique Passive: 10% AS, 15% crit, 4% MS Unique Passive: Champions can move through units

Basically, giving it the same stacks as Shiv would without the passive of Shiv if one were to build a 2nd Dancer. And it's still 300+ gold more expensive.

Also, buffing it to have 10% total MS. Giving it the lowest MS isn't fair in my view when you consider it has the weakest passive compared to Triforce or Shiv.