Remove Snoke, Kylo, Luke, Rey, maybe Maz, and the Starkiller.
Make Finn and Poe the leads, with Finn acting less like a fucking retard, and make Phasma the main antag.
Set the movie about the Resistance fighting the insurgent FO.
If people demand lightsabers, cut Luke back in as a successful master who covertly sends Rey (his protege, not abandoned on an ass-backwards planet) to covertly aid the Resistance, then you can still force your shitty love story.
Bam, I just made your movie far more logically consistent and WAY less retarded, while making it something actually fun to watch.