Very, very rough test for an idea regarding Luke dropping the lightsaber:
Have you considered simply omitting the lightsaber altogether? Seems like there’s enough footage to be able to do the intro without Rey even reaching into her bag and offering it to Luke. Rey approaches, they stare at each other and Luke walks away.