Okay. This is how I think the scene would best play out.
“A thousand generations live in you now. We’ll always be with you… but this is your fight.”
Completely remove Luke telling Rey to take both sabers with her, which I wasn’t the biggest fan of the line. I think Rey should make that decision herself, rather than being told to by Luke. Very much like how in your edit of Episode II, you removed Mace Windu instructing Anakin to talk to Palpatine about taking Padmé back to Naboo, in order to make Anakin come off as competent and mature. Leia’s saber is something Luke is offering to her, feeling Leia would give it to her at some point when she was alive.