Aalenfae and I are trying to reach some sort of solution for the Tattooine sequences in AOTC, though it might be difficult to make it work. The general idea is to leave Tattooine for the end of the movie where clearly a timeleap is established.

Basically it would be implied that Anakin has returned to Tattooine before/has been in contact with his mother all these years, and he knows where she's living currently.

The conflict now would be duty vs feelings. Anakin would be dreaming all throughout the movie about his mother, however he constantly denies his emotions and keeps being attached to his misions. By the end of the movie, when released from assignment, he goes to Tattooine and finds out he was too late and Shmi is dead.

There are some things and mentions in the movie that can't be erased without major changes and reshooting. However, if reduced to the minimum, they pass from being key, to anecdotic.