I remember seeing a set photo back in the day of the Federation tank and it seemed to be positioned near some Tatooine props because somehow I started speculating that the droid army would invade there which would explain the strong dislike of droids shown in the Cantina scene of ANH and possibly why there were so many for the Jawas to make a living out of salvaging.

I wonder if it would be possible to have the invasion on the desert world and transfer some of the effects to that location.

It would be dramatic to have the fighters swooping down after the podrace and have Qui-gon running to the ship shielding the boy from blasts only to be stopped by Maul.

Naboo could be the next in world targeted or the first world targeted and Tatooine is raided to flush out the Queen.

It would also explain why the Jedi don't allow Anakin to rescue his mother as she she would be on an occupied planet, one of many come AOTC.

The Geonosian scenes could then become scenes on an occupied Tatooine and Anakin would then help liberate his own people as per his childhood dreams.