Here’s how I’ve decided to tweak both R2D2 scenes for myself now -

1st R2D2 SCENE RE-ARRANGED LIKE THIS:

…Han follows Leia saying “I’m only trying to be helpful”, as Leia replies “When did that ever help?..and don’t mention the Death Star!”, as Han sighs…
…BB-8 rolls forwards and pulls a ‘tarp’ cover off to reveal an inanimate R2D2… (however, I’m not particularly keen on the fact that he was just covered with an ‘old sheet’ in the first place…and am torn between showing the full shot OR just starting it at the point where BB-8 rolls forwards again AFTER he’s thrown the ‘tarp’ away)

(at this point I’m REMOVING the initial shot of BB-8 ‘beeping’ up at R2D2, as well as the shots of him ‘knocking’ R2D2 twice…as I’m MOVING them elsewhere)

…BB-8 ‘beeps’ up at R2D2 and then turns as C3PO appears saying “BB-8…you’re wasting your time”, as BB-8 quizically ‘beeps’ up at him…

(at this point I’m TOTALLY DISCARDING the shots of C3PO saying “It is very doubtful that R2 would have the rest of the map in his backup data”, as BB-8 ‘beeps’ at him, and C3PO replies “I am afraid not…”, and am going directly to the next words below instead)

…C3PO says “…R2D2 has been in low power mode ever since Master Luke went away”, as BB-8 turns to look at R2D2, and C3PO continues “Sadly, he may never be his old self again”, as BB-8 drops his head mournfully…
…Han says “Listen to me will ya” to Leia…

2nd R2D2 SCENE RE-ARRANGED LIKE THIS:

…wide shot of Leia and Rey hugging beside Falcon at base…
…Chewie is mournful with head bowed…

(at this point, I’m TOTALLY DISCARDING the shot of R2D2 ‘wakening up’ as BB-8 then rolls towards him ‘beeping’ quizically, and am instead replacing it with the shots below that were REMOVED from the 1st scene)

…BB-8 silently looks up at R2D2… (this is a ‘rear-view’ shot of BB-8)
…BB-8 briefly silently looks up at R2D2 (this is initially a ‘front-view’ shot of BB-8), as he then ‘knocks’ him twice and rolls back slightly to look up at him…
…BB-8 looks up at R2D2 and ‘beeps’ a squeal… (this is now back to a ‘front-view’ shot of BB-8)
…BB-8 quizzically ‘beeps’ as R2D2 begins to shake and ‘beep’…
…BB-8 ‘beeps’ excitedly up at R2D2, and then turns as C3PO appears saying “R2D2…you’ve come back!”, as R2D2 ‘beeps’ excitedly as he turns towards him…
…C3PO says “You’ve found what?”…

(at this point I’m TOTALLY DISCARDING the shots of R2D2 ‘beeping’ sharply at C3PO, as C3PO then says “How dare you call me that!” and lightly slaps R2D2’s head as BB-8 looks round, and am going directly to the next shot below instead)

…R2D2 ‘beeps’ excitedly to C3PO…
…R2D2 continues ‘beeping’, as C3PO says “Find Master Luke, how?”…
…wide shot of C3PO/R2D2/and BB-8 as C3PO says “Come R2…we must go and tell the others at once”…
…Leia is mournful with her head bowed in front of a screen, and then turns as C3PO says “General…excuse me, general”, and we pan along to see R2D2 ‘beeping’ beside C3PO…

(at this point, I’m TOTALLY DISCARDING the shots of C3PO saying “R2D2 may contain some much needed good news”, as Leia then says “Tell me”, and am going directly to the next shot below instead)

…wide shot of R2D2 beginning to show his ‘holographic’ map section to everyone, as BB-8 rolls towards it, before getting his ‘chip’ off Poe and then slotting his ‘holographic’ map section into R2D2’s map…

(and for anyone that hasn’t read the official reasoning behind R2D2’s current onscreen awakening, here it is - http://www.slashfilm.com/j-j-abrams-explains-role-of-r2-d2-in-the-force-awakens/ - I was never keen on just showing R2D2 randomly ‘awaken’ personally, and while this re-structure is not a whole lot better at explaining his ‘powering up’ at this point, I’d rather see him kinda ‘knocked’ awake by BB-8 instead)