Some more thought on the Poe recapture -
If this idea where to be really incorporated into the movie, there would have to be some more dramatic changes such as adding/changing dialogue for the stormtroopers in the Maz Castle battle, which is where most of the issues lie.
Finn fights TR-8R, who in this version would have been part of the squad sent to the TIE wreckage. He could be dubbed to have an entire one-sided conversation with Finn, communicating that he let Finn live because he was always a decent person, but now he’s just a traitor who has joined with the enemy. My goal with Finn’s character up until this point in the movie is that he won’t kill a fellow trooper except in the most dire self-defense, but this could mark a turning point where he commits fully to the Resistance.
Also, in the restructured scene where Kylo learns of the map from Rey in the woods (but before the Resistance arrives), he sees the explosion from the Star Destroyer then the re-dubbed pair of troopers inform him that the ship has been attacked and the prisoner has escaped. I think this would be all that is necessary to establish that Poe has returned to his X-wing and is about to join the fight.
JEDIT: It’s probably too much for too little payoff. Probably the better approach is to more clearly imply that Poe woke up after BB-8 had left Jakku. As it is, it feels like our heroes get to Maz’s castle long before night falls on Jakku for Poe to leave, but it could be interesting to have the Falcon chase set in the late afternoon or evening and restore the TIE fighter sunset shot from the Maz castle battle. This in addition to some changes to make it seem like more time was spent between Jakku and Takonada would sell the idea. Though there is still the issue of the missing Stormtrooper squad, so I think a dub of TR-8R would still be really promising.
Here’s a quick and dirty attempt at what this might look like:
https://diff.pics/qTb-ghzfDg6p/1
Obviously some shots are too dark, and will need individual adjustment.