You could have the Ahch-To scene (sans burning TIE) near the beginning, possibly even tying it into Rey’s training somehow. That way Luke can still give it to her…
Unless you plan to get rid of Rey attempting to give Luke’s Saber to Leia, to give the impression Rey has both sabers for the entirety of the film?