If the ship is going to be different in the flashback why does Ochi’s ship even need be in the movie. Could it be completely removed in the edit?
The exterior shots of the ship shouldn’t be cut because this would be a bit weird-- Poe and the gang going inside a ship we never see. The ship could not be cut entirely (exterior and interior) because the whole reason for going to Pasanna is this ship. Also a few key plot points happen on Pasanna and at the ship.