The Discord tihng went worse than canon.. he did something perhaps not technically fatal but inconveiniently close to permanent (Maybe banished her to a sundog for a thousand years?) before Twi managed to re-awaken her freinds and take him out with the Element artifacts, the rest like you said, but call the Equestria version the Cavalry Sabers. You could stick that Blueblood prick in the role of Mason (Or as Quincy, perhaps with Trixe as his Madigan) perhaps?It makes the the thing rely on happening kind of fast, but if the less reality-breaking of Discord's changes couldn't be reversed without Celestia's power, for example if hadnling both sun and moon was barely within Luna's abilities leaving nothing to spare for more general changes, anything that brought order out of the chaos would be at least some kind of improvement even if after a few years it turned out more adjustments were eeded. THis would also give Spike time to reach mid-teens-equivalent to match up to Mackie.
- CD
--
"Anko, what you do in your free time is your own choice. Use it wisely. And if you do not use it wisely, make sure you thoroughly enjoy whatever unwise thing you are doing." - HymnOfRagnorok as Orochimaru at SpaceBattles
woot Med. Eng., verb, 1st & 3rd pers. prsnt. sg. know, knows
- CD
--
"Anko, what you do in your free time is your own choice. Use it wisely. And if you do not use it wisely, make sure you thoroughly enjoy whatever unwise thing you are doing." - HymnOfRagnorok as Orochimaru at SpaceBattles
woot Med. Eng., verb, 1st & 3rd pers. prsnt. sg. know, knows