Thoughts on up coming season 7 and Guardians of Harmony

Update on my progress of the story
So planning the outline is taking far longer than I anticipated. I have scenes in my mind that I want to take place in the story but setting up theses scenes is harder than I expected. Another problem I'm having is that I keep changing how I have the characters meet with each other and figuring out their backstories. I have been pouring a lot of thought into the main characters but I am having trouble putting the villains together such as who they are why they do what they do.

As I have been messing around with these characters and possible scenarios for them to go through, more ideas for new stories have been flooding into my mind. So now I don't if I want to pursue these new ideas or not. I really need to learn to focus on this current story and get finished planning it out and start writing it so it can finally be free from my mind.

Season 7 and how it might connect to Guardians of Harmony
I have been developing some thoughts about the upcoming season and how it may connect with Guardians of Harmony. During the holiday season, I noticed that the stores had put up toys from the Guardians of Harmony line and here are details that I noticed in the toys and in some images I have found online:
1. There are no images of Starlight Glimmer anywhere. After the Season 6 Finale, it did make me wonder where she could go in season 7: Is she just gonna stay as Twilight's student? Is she gonna stay in the village and not come back to ponyville? Is she gonna leave ponyville and travel with Trixie?
2. Chrysalis appears to be the main villain. I'm guessing she finds another hive of Changelings, destroys their leader and takes control over them. Another idea is that she uses mind control magic on her original hive and reverts them back.
3. Nightmare Moon appears along with the changelings. I'm guessing Chrysalis takes of control of her mind and reverts her back as well.
4. Cheese sandwich might be coming back. He had a toy which came with his super party cannon.
5. Spike's full grown dragon form is constantly featured with the Guardians. I wonder if Spike is gonna be like the Hulk from the Avengers. In which he figures out how to control his emotions so he can go back and forth between his small size and his full grown size, that would be really handy if Equestria goes to war with Chrysalis.
6. Are we gonna get any further development on Fluttershy's relationship with Discord? After the events with the Changelings, I think discord could become over protective of Fluttershy. Fluttershy however could tired and they end up in a fight. Knowing the writers I don't think they are going to do anything with these two.