About the Maz’s castle attack scene, here are the changes needed (as I see it now):

• Lone Star Destroyer
• Alternate music and sound
• “They’ve found us”

Optional:
• Remove sunset TIE shot
• Regrade outdoor scenes to evening/sunset
• Change Maz’s line “Those beasts! They’re here.”
• Put back cool X-wing shots from trailers in the battle

I tried the Kylo shuttle idea, it looks fine but doesn’t really work after all, so I’m on board with only the Star Destroyer. I’ll revise my edits and see what we get.