It still feels incomplete though. Maybe parallel editing wouldn’t be so bad if it was applied near the end of the two scenes. I’m imagining Rey meeting Luke, then cutting to R2 waking up and in place of the Leia scene having the final bit with Rey offering the lightsaber, then the map reveal.
Try that! I think that would work well.