4D is perfect!
Have you given any thought to ending the movie on the Falcon group shot? I think that would be awesome as it could help alleviate all the ST films ending with the same theme and have a more upbeat and quick ending. Maybe broom boi could be recycled as an ending for IX.