I still think TFA would have benefited so much from having Maz removed, and use Leia instead to do the equivalent.
Have the FO landing on the catina's planet and starting the battle, as in the movie, as a result of BB8 having been spotted by someone. Have the whole battle play out, but including Rey in it. The resistance arrives and Leia goes into battle, some banter with Han as they reunite during the conflict. When she gets her blaster shot out of her hands, she takes out the light saber she had to her belt, blocks a few lasers, nothing too fancy, it's more of a keepsake and a last resort weapon. Eventually the conflict ends. During the night, Leia and Rey talk, and that's when Rey touches the light saber as Leia hands it to her. Cue the vision, Rey running away, gets captured by Kylo.
I think this small change would have been such an improvement, building a stronger relationship between Rey and Leia and how both can relate to the saber/force's significance as well as Leia not having known her parents, a more intuitive reason as to why the saber would be there at all, and no dumb Maz CG alien who was there just to forcefully dump expository dialogue. Can't believe they got Lupita Nyong'o to play such a lousy character.
Heck, I can't help but think this was originally the plan and was changed for whatever dumb reason.