Ah! I was thinking something similar: editing the subtitles so anakin gets to leave early.
I just thought of something... what about replacing the Jar Jar scene with the deleted scene where Anakin fighting with Greedo? Qui Jon intervenes so thats how they meet again.