To fix it would be easy, just delete those scenes. No cringe and better continuity.
It would be cool if some fanedit showed the Rebel soldiers frantically transmitting the plans to the Tantive IV, floating somewhere at the edge of the Scarif system. It would still use the Leia CG, but would make for much better continuity.