The duel with Kylo makes no sense if Rey has been training for 5 years. Why would Kylo duel Finn first, why would Finn have Rey’s or someone else’s lightsaber, why would Rey get force-pushed unconscious if she’s had 5 years of training, and why would there be so much drama over who can force-pull the lightsaber if Rey was already practicing with it over the course of the last 5 years?

Also, where do you put the Force-Time sesions? She goes back to on Ahch-To for even more training? That’s redundant, a lot!

After IX however, there might be a way to simply cut this duel entirely. Rey trains, and has Force-Time sessions with Kylo, and it culminates in their temporary alliance in TLJ. Then they fight for the FIRST TIME using IX’s probable footage.

Something like that. A rethread of the OT but instead of the Luke/Vader fight in ESB they actually fight together, and THEN duel a la ROTJ