Diver Rework - Diana

Rumour has it that the next class update will be the divers and that Diana is considered to be a diver. I'm interested in finding out more ASAP so I don't continue to commit to investing/learning a champion who'll be reworked (like what happened recently to me with LeBlanc). I've also got some thoughts on what I'd like to see from her below.

Here are the things I like about Diana:

• Her aggressive personality and theme, wanting to dive in and chop everyone up with her sword
• She's rewarded with more defence from her offence from her pale cascade ability
• Her burst, and some bruiser like DPS qualities from her passive and shields
• Her spit pushing and melting of turrets
• You can use her in the jungle or the mid lane - one of the few champions who can do this

What I don't like about Diana:

• Her laning phase is average until level 6
• She's heavy on mana in the early levels - you have to hit your present strikes with perfection to stay ahead in lane
• Her Moonfall ability has a large delay for its range, and doesn't reward you enough for using it on a team in a fight

I'm pretty sure the next class update is the divers, and that Diana is considered by Riot to be a diver rather than an assassin so here's my thoughts on what could work for her:

• Add scaling attack speed to her passive, and a small shield when her passive on proc
• Lower the mana on her Q, in particular the early levels
• Switch around her e and her r (if she's a diver, why should she wait until level 6 for this?). Significantly improve her laning phase.
• Her new E ult should have increased range, longer cool down, and apply moonlight to all enemies
• Moonlight should only be consumed on the target it's used on
• Lower the damage output somewhat to compensate (she'll have to rely on her passive and defences more)

I imagine this will keep Diana as a somewhat bursty midlaner with a healthier laning phase that has to rely on some extended DPS and shields to finish champions off, makes her more viable as a jungler, and increases her theme of aggressively wanting to chop down the enemy team. Her ult will also help her and her team succeed with this. Perhaps she'll be seen top some more too.

Does anyone else have an idea with what they'd like to see from diver Diana?