Nerf to Death's Dance.
Lower the DOT to 20% overall, then make it 10% for ranged champions.
By doing this you nerf the melee champions like Riven and Fiora enough while also taking out Ranged champions that are abusing the item and becoming way to hard to kill. The whole point of ANY carry ranged or melee is they die easily but deal a lot of damage, it makes sense for champions like Riven and Fiora to have some sort of way to reduce damage, they have to be in the middle of a fight. For champions like draven they don't, you have to go to them in order to kill them and that's really hard enough without Death's Dance and Phantom dancer making them tankier than they should be.
A ranged carry should actually be afraid of dying, think about positioning and do their best to avoid getting killed. With Death's Dance's current state ranged carry's that can build it have nothing to worry about aside from if they REALLY REALLY REALLY mess up, before positioning poorly once would get you killed, your squishy, the counterplay to an ADC being able to shred whole teams is they die quickly if their caught, item's like Phantom Dancer and Death's Dance alleviate or effectively remove this counterplay.