If everyone’s okay with being away from Rey for a while, the scene reordering becomes more simple:

Resistance Base
Weapon Charging
Battle Plans
Farewells
Interrogation
Snoke

Not knowing what’s happening with Kylo and Rey may be a good thing, since the focus would be on Finn and his plan to get Rey. As it is, Finn concocts a desperate plan to save Rey when we know she’s already escaped and is in the process of finding a ship to escape.

So if we wanted to make this a more dramatic rescue (Read: ignore because I get carried away), the next scenes could play out like this:

Snoke
Landing at Lightspeed
Rey’s Failed Mind Trick
Lowering the Shields
Preparing to Storm the Detention Block (ending with “Are you sure you’re ready for this?” “Hell no.”)
Rey’s Escape
Hangars on Lockdown
Rejoining Rey