Yeah to me it looked like JJ was trying to adress the “Marysue” elements of Rey right off the bat in the intro training montage, failing the circuit and admitting that she is unworthy of the saber and needs more training, but the way it was executed was terribly rushed and felt quite contrived.
It was contrived. He has a couple of shots with Carrie handing the saber back and forth and he wanted to use them and the way he did it was clumsy. That is the one edit I’d make. Rey wouldn’t give Leia the saber or take it back. The dialog part of the scenes wouldn’t need to change. Other than those two, I thought the Leia scenes worked well. But those two make the story stumble a bit.