Some Edits to 'To Where and Back Again'

The second part should have been the first episode of season seven.

Starlight and Trixie escape and teleport to Canterlot only to find Changelings there.

They then teleport to the Crystal Empire to warn Princess Cadence only to find it under siege.  It is Here that they meet up with Thorax.

They decide the only way to deal with this is to summon Discord and have him confront and defeat Chrysalis.

No Barrier.  They use magic when they need to.  Chrysalis uses Changelings disguised as Fluttershy to confuse and reduce his effectiveness.

Ending:

Instead of merely swatting away her gesture of reconciliation Chrysalis shows her how she really feels about her efforts at rehabilitation by holding her hoof down while she fires up her horn and then blasts Glimmy at point blank range before making her getaway.