Have you ever considered making it so that Luke simply hands Rey the lightsaber back (using reversed footage) and storms off? The way Luke tosses the lightsaber in the movie is obviously played off to be some sort of joke in a very serious moment.
I believe Ivan Ortega’s edit does this.
Just watched the ortega Clip it’s Hella Good, I think it could be better if it used tfa footage of rey walking up (like how dig mod cut it off tfa) but is definetly better than the sabers toss, starts the movie on the wrong foot