NeverarGreat said:
Two versions would be tricky unless you also prefer the original version with R2’s coincidental awakening, since I’d have to make two entirely different versions of an edit-heavy sequence.

Eh, I don’t think it would that difficult. Obviously things are still set to change, but going with your idea of having Rey fix Artoo — that works fine. In fact, I think I’d keep everything after that.

Basically, keep everything immediately after Artoo wakes up.

The only thing I can think of that could be questioned is where is Rey when Artoo shows the map. Granted, she wasn’t in the original scene either, so I don’t really know if this matters.

…What I’m trying to say is that JJ makes the search for Luke the point of the movie when Luke’s role should really be about what his legend means to others.

I certainly do understand what you are saying, and they are good arguments. What I disagree with you about is that I don’t think JJ made the “point of the movie” to be about the search for Luke. Just because Luke is the focus of the ending scene doesn’t mean that what the movie is about has changed. Also, I do kind of feel like it is necessary because he is a legend, a myth. When the audience sees the mysterious that surrounds him, when we experience that same build-up of curiosity that Rey feels, that’s how you know that the scene is successful.