Here’s a suggestion: Introduce the Rey/Luke scenes without the saber toss is by cutting to Rey with her saber, sitting on the beach.
I’m not following ya here. So we show her going to hand him the saber, and then just cut to her on some beach? I don’t recall a beach. Are you referring to when she picks it up after the Porgs try messing with it?