Bingowings said:

You could keep that approach and also make Geonosis Tatooine.

After the dust of war has settled his mother is dead he is too busy doing his duty as a Jedi to do his duty as a son (the beginning of his resentment towards the Jedi).

Ending on her funeral instead of his wedding would pack more of a punch than ending TPM with Qui-Gon's.

Shmi is one of the few truly sympathetic characters in the PT much more than Qui-Gon. Indeed with Padme's in ROTS the saga plays out as Four Funerals and a Wedding.

It would serve as a better 'they rhyme' moment with Anakin's pyre in ROTJ.

I actually quiet like that idea. Ending with Shmi's funeral does pack a bit more of a punch, although it might be weird since R2 does come to tell Anakin of Obi-Wan message during the funeral.

By the way, has Adywan decide whether or not he's going to alter Anakin's voice to make it deeper? I think Anakin's voice might need to be altered at the very least in some way. Also if Adywan does plan to keep Jar Jar in some capacity, does he plan to either alter his voice or create some type of language that the gungans speak?