I think the cleanest way of removing that issue would be to change the model of the ship in her flashback, removing any connection between Ochi and Rey.
Or you could change the TROS flashback ship to the one seen in TFA, since that movie actually had a different design for Rey’s parents’ ship:
