When Obi-wan drops off baby Luke to the Lars Homestead in ROTS this is when the fight with Maul and Qui-gon should happen.

Perhaps Qui-gon should be trying to rescue Obi-wan (would have to Add the cgi beard) But Qui-gon would be referring to Luke when he says train the boy and not Anakin. Kid Anakin is actually young Luke.

This is perhaps the best edit Idea I have Had in a long time.

I also started thinking about young kid anakin from TPM looks more like a young Mark Hamil than a kid Hayden Christenson.

Obi-wan should have doubt about training Luke not Anakin / Darth Vader Qui-gon must be the one to tell Obi-wan to train Luke for which he eventuallly does years Later to right the wrong of Darth Vader. Perhaps the Backgrounds of the duel on Naboo could be Made into A desert Tatooine setting instead making Obi-wans story a bit more complex. We never needed to know Kid Anakin at all but it would make sense to know a Kid Luke.