You could potentially use the Falcon going to Ahch-To (reusing TFA footage), have Rey and Luke’s talk, move the Dejarik scene from the beginning to between the outdoor chat and the flashback to show where Poe/Finn are at during, then have them travel to Pasaana.

This way you still get Rey feeling uneasy and cut off, you reveal Rey’s misgivings (maybe more vaguely about the dark side rather than about parentage), she can receive the lightsaber, and know the stakes for Leia deciding to train her. Might give more weight to the scenes with Leia, knowing those stakes earlier.