I’ve been playing around with the ending for my personal edit, which is a Rey Nobody edit, and I think I’m onto something that could be useful to others:
Basically, I used footage from HAL’s version and the theatrical to eliminate the old lady and the “I’m Rey” business, so we can end on a more emotional note.