In case anyone could be prompted to come up with genius ideas, the weak point in my proposal is still Finn’s change of heart and return to Maz’s castle. As it stands, minus FX work, he sees the TIEs approaching, and then we next see him in the basement. Missing is some sort of telegraphing that he wants to head back.
Just add back in Han Solo watching and Finn asking “where’s Rey?”.