@Hal: That’s great. With some VFX that shouldn’t even be that hard to do and a new score, the scene should work perfectly this way.
@Imhotep: I don’t think that your approach can work story-wise, as Finn goes from leaving to fighting the First Order with no explanation at all. The audience would assume he left after he talks to Rey and later he suddenly returns for no reason.