Here’s a potential bit of restructuring that can help the removal of the cutaway to the Resistance HQ feel more organic.
https://vimeo.com/170889793
After Han is killed and Hosnian Prime is destroyed, Kylo Ren starts to hobble toward Finn and Rey, who begin to run away. Cut to the areal dogfight, and a pilot notes that they now have a chance to infiltrate the oscillator. Cut back to Finn and Rey making for the Falcon and encountering Kylo Ren. After Rey and Kylo begin to fight, cut to the X-wings descending toward the trench.

This would bump the pilots noticing the damaged oscillator up to right after it happens, and cover an otherwise awkward cut.

Also, there’s a quick cutaway during the trench run to Hux being informed the base is almost ready to fire. But, that’s easily removed.

EDIT: Also, also, I believe this project of ours will end up removing all mention of Hosnian Prime by name. Not a big deal, just a note. It was super easy to miss as it was anyway, and this wouldn’t affect the plot. People will be more apt to mistake it for Coruscant, which it is the functional equivalent of.