In the cave scene of TROS, when the flashlight gag happens, replace Poe’s flashlight with an actual lightsaber to eliminate the gag. The flashlight remains a lightsaber throughout the tunnel sequence, but it is never commented on.
On Kijimi, when Finn and Poe argue and Finn leaves to find Rey, show Finn taking that same lightsaber from Poe as he gives Poe the binoculars. In the hallway scene where Finn dramatically looks around, have him ignite the saber. The saber remains ignited as he runs toward Rey and calls her name, but when she pushes him back she also force-pulls the saber into her hand.
On Ach-To, cut everything about Leia and her training. When Rey “takes both sabers to Exegol,” it’s the Skywalker saber and the Finn/Poe saber.