Given the situation, JJ should drop the pretext and make it a pure fun action movie. (Some of the following is serious, some of it not. Just having fun!)
Act I
1. Resistance fleet reorganizes around Endor.
2. Rey completes some sort of Jedi training from Force Ghost Luke. Poe teaches Finn how to fly an X-Wing.
3. Resistance finds out Kylo/First Order is at the Knights of Ren's stronghold planet. FO won't expect sneak attack, so Resistance plans to attack.
Act II
1. Resistance fleet sneak attacks First Order fleet.
2. Poe and Finn lead an epic air battle that starts in space, moves into the atmosphere, and finally ends in the skies above the Ren stronghold.
3. Rey covertly enters the Ren stronghold. Inside, she encounters various FO troops and Knights of Ren; she battles and kills all of them.
Act III
1. Rey arrives at Kylo's throne room. By now he is completely corrupted the Dark side. After sharing views with him, Rey realizes she can't save him. They fight.
2. The air battle intensives, with the Resistance losing. Poe sacrifices himself by crashing into the flagship Star Destroyer's bridge, causing the ship to plunge into the Ren stronghold/FO bases. The shock allows Resistance forces to counter effectively and turn the tide against the FO.
3. Explosions from the Star Destroyer crashing into the stronghold allow Rey to gain the upper hand. She tearfully kills Kylo, whom she realizes was a promising young man who was tragically misguided. She turns to escape the crumbling stronghold, but is confronted by a cloaked figure. The figure pulls back their shroud to reveal DARTH JAR JAR was pulling the strings the whole time! Jar Jar ignites his dual-wield, double-bladed lightsabers and fights Rey. Rey is outmatched, but then the Force ghosts of Luke, Yoda, CGI Obi-Wan, and CGI Qui-Gon intervene and help her defeat the true phantom menace.
4. The limping, surviving Resistance gathers on the nearest planet to heal - Tatooine. They celebrate the victory amidst bemused moisture farmers. Dusk falls. Finn believes Rey to be dead, but then in the distance sees her walking toward him with the binary sunset behind her. The movie ends as the two kiss, and look out at the burning twin suns.