Jakku and Luke's Jedi Academy

I think you and @master_shaitan are both on the right track. It got me to thinking about R2D2 being in that shot with Luke, then (unfortunately for her), I shared my thoughts with @IrisBest. We have come up with a possible subplot that puts together Luke, R2D2, and Poe getting off Jakku and into the Battle of Takodana. But, it all depends on that shot of Luke being on Jakku- if it's not, we're wrong.

1). The FO, Poe & BB8, and Luke & R2D2 all converge on Jakku at the beginning of the movie, and they are likely after the same thing- Rey and/or the lightsaber. Probably the MVS character has tipped off one or more of them. It may be that Luke arrives after the action is over, or it may be that he doesn't feel that he can intervene. We know that Poe's regular x-wing is obliterated, he's captured by the FO but escapes with Finn in a TIE, which is heavily damaged as they flee. BB8 finds Rey.

2). After Poe crash lands and is separated from Finn, Luke & R2D2 find him in the desert (very reminiscent of Obi-Wan finding Luke). I think he helps Poe off the planet by giving him his own X-wing, and R2D2. This explains the mystery of how Poe gets to Takodana and into an (apparently black!!) X-wing in time to fight. Also, R2D2 has not been with Han or Leia according to the shooting script. Where has he been? With Luke. R2 helps Poe fight at Takodana. He is reunited with the heroes (minus Rey, who has been captured) at the Resistance Base where he is introduced to Finn according to the script.@IrisBest found this recent pic at MSW that shows R2 in front of the Black X wing.


3). In the shooting script, there is mention of a Black TIE fighter that "saves the day". We know that Poe is in the black X-wing from the trailers, so it could be him. But, perhaps it's Luke. He could easily steal a TIE fighter & what could be more important to Luke than saving Han, Leia and Rey? He's probably been watching Rey all along. I think he doesn't even land after the fight- he's done what he came to do, and goes back into seclusion.

4). But even if Luke doesn't go with Poe to Takodana, imagine Poe showing up with the story of meeting the legendary Luke Skywalker in the desert, and coming back with his fighter and R2? No wonder he's whooping when he arrives! He's in Luke SkyWalkers X-wing! There doesn't even need to be any film footage of his rescue for this idea to work out- Poe could tell the whole story. After that, he founds the Black Squadron.

5). Then, as Maz said, "Hope is not lost today... it is found," because even though Rey has been captured, Luke is back- somewhere out there.

What does everyone think? Are there holes or inconsistencies we haven't seen?