Here’s a version with most of the Luke scene and the dream effect applied to the rest of the shots:
I’ve also gone ahead and applied the final piece of the map to R2’s projection, now all that remains is to erase Rey from this one shot and she will be gone from the scene.
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.