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…
That could be a good idea as well. Maybe some kind of “a few months earlier” flashback, just to set up that Rey has it.