1) I have found to my displeasure that I need to go back to drawing board for the Western Wastelands arc in the "Fallout: Equestria Girls" story. I can churn out a chapter or two without doing that, and then I will have to rethink a number of things.
I haven't seen "Forgotten Friendship" in full yet, but from what bits I saw on YouTube, my own headcanon got screwed (namely, that Sunset never got back to Equestria and never saw Princess Twilight and Princess Celestia until the events of Fallout: Equestria Girls).
Expect some retcon. There won't be much, but Chapter 31 at least will have to be re-written a bit.