Hopefully they way they buff Moonkin form is by making it affect how certain spells work. I.e add affects on spells such as Insect Swarm. Make the application of Insect Swarm refresh by X seconds everytime Solar Beam is used.
Obviously not that, just an example. A bit how Starfire Glyph works, but only when cast in Moonkin form to keep it different from general caster form.