MrInsaneA said:

WAIT!

Waitwaitwait

Battle of Geonosis, Jango is there AND Jango dies.

But he'll still be alive in your edit after Geonosis. How will he kick the proverbial bucket?

Jango dies in a modified version of the Obi/Jango fight on Kamino or during the space fight over Geonosis. Still deciding.

EDIT: Just remmembered that I might rename Jango, Boba. Jango Fett wouldn't exist. However that would ruin continuity with Clone Wars. I'd only do this if Jango's new death doesn't work. Also, I could rotoscope Mace and Jango out of the arena into the battlefield.