The new structure works for the most part. I ended up dropping the scene where Kylo talks about Rey’s power for two reasons; the first is that Rey’s powers speak for themselves at this point, and the second is that the trooper’s line was used for the Phasma conversation.
I also moved the part of the Kylo Falcon scene where he steps outside to right after Han decides to go into the Oscillator. It still needs work.

The Kylo Falcon scene still felt a bit jarring no matter where it was, so I created a new shot to introduce the scene (and give our first glimpse at the reclusive First Order speeders):

Password: fanedit