In my attempt to change Luke from wanting the Jedi to end, he is now is just feeling sorry for himself after failing with the Jedi Academy and and Kylo. He is at first reluctant to train Rey, and he has gone to the island to die alone and miserable, but gone is all talk of the Jedi ending. That version of Luke never worked for me. The biggest challenge I had was wanting to keep the Yoda scene. Here is what I came up with. What do you think?

After Rey and Kylo communicate in the Rain, I may cut to this: https://mega.nz/file/E0AgHb4R#5dvrKMU3fBwY52_LpKsGrtX7dutSqyWBXcZUVtpggxA