Upon considering this idea further, I wonder if I could pull more of the alternate Visions ending into this version.

In my original alternate ending, Rey observes BB-8 knocking his dome against R2 and takes it upon herself to help search his backup memory for the map. However, all of this information was implied because I split the first R2 scene in half, with 3PO’s exposition in the first half.

But I could instead split the R2 scene differently, with BB-8 uncovering R2 and knocking him with his dome before becoming discouraged and rolling away. then at the end of the film he returns to R2 where he is joined by Threepio and his exposition about the backup memory. Rey could view this exchange, using the footage of her deleted scene, and the resulting shot of R2 hooked up to a computer would be far more coherent. It also helps the credibility of the scenario if only BB-8 had considered the possibility of R2 holding the map, and only briefly earlier in the film. He might have considered the possibility too remote to bother with, and 3PO’s later exposition confirms it.

It may feel a bit weird to have a short scene halfway through the film with BB-8 and R2 without any dialogue, but it may be nice to have a scene that isn’t holding the audience’s hand for once. It’s probably enough to establish that R2 is at the base unresponsive, and that BB-8 wishes that he weren’t.