Sort of what I’ve been picturing:
Finn: Where’s Rey?
Cut to same island shot. Then cut to Rey entering frame, looking back Chewie, R2 and the Falcon. An abridged approach to the cliff, trying to avoid repeating shots. Use the same music as Rey’s first scene in TLJ, Rey reaches the top and it cuts to the empty cliff side on the swell of music (originally the musical point where Luke tosses the saber). She then goes back down to the village. Luke shuts the door before she can see him. She knocks, stands there, looks around. Looks toward the ocean and cut to the insert of the X-Wing submerged in the water.
When you cut to Luke in the hut, you also can cut the shot of him folding his ceremonial robes.
I really like this. Yes, it would require painting Luke out of the scene altogether, but I don’t think it would actually be terribly difficult, particularly for the wide shots.