One more suggestion: What about removing 3POs line “It is very doubtful that R2 has the map in his backup data?” I never liked that line considering that R2 in fact has the map in his backup data. And with R2 starting to wake up after BB-8 talked to him, I don’t think this line is needed at all.
You’ve just described V1 and the reasoning behind it. What’s different now is that R2 begins indexing his hard drive, prompted by this conversation.