What about making Rey a Jedi to begin with? It’s rough, but suppose Rey is an exile after the destruction of the temple. It would explain Kylo’s concern of a girl on Jakku helping her, and avoid repeating Luke’s becoming a Jedi arc.

To do so, you’d have to cut all the references to Rey not knowing why she’s so strong in the force. Then you really just need one line - Kylo in a mask would be easiest to replicate - telling Hux or Snoke “a former student of Skywalker, turned exile. Unrefined, but powerful” kabam Rey’s power solved without any complicated lore.

And while writing this I realized it accomplishes the following:

—-Gives Rey a stronger reason to be so secretive of her past and reject the call to the Jedi, because of her bad childhood memories.
—-Makes Luke’s struggle to rebuild the Jedi meaningful because without it Rey, like it or not the ultimate hero of the saga, was brought up by him. So Luke plays a vital role in the final victory.
—-Makes Luke Rey’s father figure who took her in after her real parents (who she presumes are important in TLJ) sold her for drinking money. So that’s why she chooses the name Skywalker (right now it’s Organa she has more connection with).