Although the scene placement sort of works where it is, it’s not nearly ideal, so I’ve been thinking about a scene which could separate the interrogation and rescue, and have an idea. It would need to be constructed entirely from bits and pieces of TFA and TLJ, but it would essentially be a better version of the Reydream and reveal the night they spent before the action starts in earnest:
JEDIT: Since it’s going to use hand-animated elements for the exterior shots, I can actually use set photos:
Original (Rey painted out):
After such a scene, it might be cool to play with the Finalizer hallway lighting to make it seem like Finn is rescuing Poe during the night shift.