I might use the space scenes from “Rose and Finn Go Where They Belong.” The shots … could replace the AT-ST escape.
That was my first thought when I saw that scene. I think it works best if you also include the scene of Poe bringing Finn up to speed at the beginning, since Finn’s “where we belong” line is a callback to Poe saying it in that scene.