Going back to the R2 scene, BB-8 now explicitly includes Rey and I think it works much better this way:
I agree that I do think this is better. I think that the wipe from Artoo to the nighttime shot comes a little too quick though. I feel like the timing of the music and the shot of Artoo needs to be fixed somewhat. Can the Force theme that’s playing maybe start a second or two later than where it is currently? That way the camera can be fixed on Artoo for another second while the theme comes to a close and before the wipe comes?