If you want a twist for the movie, how about Rey buries the lightsabers and then looks at the camera and her eyes are sithy and you hear a palpatine laugh like from the trailer. Palpatine wins, end of saga.
Honestly would have preferred that to what we got, that way the next trilogy will have Rey as the Antagonist and Finn as the Jedi or something.