Heard back from Yads and he was fine with it so I have gone ahead and uploaded a very rough mock-up of what I was discussing earlier on Youtube. Thanks for all the tips too guys - much appreciated.

http://www.youtube.com/watch?v=09brn4FDReM

Changing the order of the fight so that it occurs just after they enter Mos Espa isn't that difficult a task - I used the same sort of trick that others have used to have it occur instead of the Sebulba/Anakin scene. What I'm unsure of is whether or not the lightsaber reveal could be massaged into working here, in this scene, or not.

Any audio issues are my fault as a result of playing around with introducing the fight sounds as well as trying to synch up the lighsaber reveal to an appropriate point in Qui-Gon's dialogue.