Diana buffs and her as a Diver

I've played a ton of Diana in mid, top, and jungle and I'm comfortable on all of her builds. I'm a huge fan of the recent buff on her E on PBE, increasing the pull distance. That all said, why not buff Diana towards her intended role, a Diver?
It's no secret that Diana is an assassin. She's been played as an assassin pretty much since release and being an assassin has been her main build for as long as I can remember. The issue is, she either gets ahead and one shots anyone in range, or can't do anything in melee range and is pretty much useless. This isn't healthy. This is not healthy assassin design. Diana is often called an Akali clone and that's not a compliment.
Diana is intended to be a Diver. The idea is that she should run headlong into a team, using Pale Cascade to survive burst and Moonfall to disrupt the enemy team. While this is a nice idea, it's not reality. Instead Diana uses the burst from her QRWR combo to one shot enemies as a dysfunctional assassin. Because Diana can use her R twice and cast all of her damage abilities instantly she can burst down most squishy champions when even or ahead.
SUGGESTIONS
Diana could be made into a Diver, or better fit the role in a more healthy manner, with few changes. Having Pale Cascade scale with bonus health and having Lunar Rush not instantly reset could go a long way towards this end. Instead of resetting, Lunar Rush could extend the Moonlight debuff on a target and incentivize sticking to them over bursting them down. As well, reducing Diana's AP burst through her bases and ratios could make her less viable as an assassin and incentivize more durable builds. I understand that a major issue with her health in game is that she lacks variance - she simply does one thing, and this wouldn't address that.
I believe that switching her E and R, Moonfall and Lunar Rush, could also help her out immensely - as it would allow Moonfall to be a stronger disruption ability. Moonfall would be more fitting as an ultimate in general to be honest, it feels like her defining big moment and it should be what people think of when they think Diana - the sigil of the Lunari and her rushing headlong into a fight.
SUMMARY
Diana is intended to be a Diver and is an Assassin. Diana is not healthy as an Assassin. Diana should be changed in ways that lessen her burst potential and incentivize more durable Diver builds. I think Diana's design isn't healthy in general, but that changing her to a Diver would make her healthier.
Diana is intended to be a Diver and she's an Assassin. Please Riot, recognize the reality and do something about it or just classify her as an Assassin and be honest. It's very frustrating seeing her be called one thing when she clearly isn't and she's not healthy in her current state.