Geez, Nev, Rey seeing R2 and remembering him from her vision is actually a solid idea. It does make you wonder why they didn’t think to check him earlier, but if feels more natural and a little less convenient than R2 waking up or finishing his data search as soon as everyone is back at the base. And you’re basically addressing this by still keeping the first scene where 3PO basically dismisses the thought (thanks 3PO).

Sure, the scene is a little awkward, but the thing with R2 at least gives it a nice function within the story.

This is another cool alternative it would be cool to get more feedback on. And like you said, what I like about it is that this idea says more about Rey’s actual personality and less on her “special powers”. Too bad we can’t see Rey help R2 wake back up.

Ziggy, that extra bit of dialogue is a good idea! Could fit in when the officer is looking at everything falling apart before he runs off.