RoccondilRinon said:
Better yet, don't kill off "Jango" at all, instead cut out the kid and refer to him as "Boba".

That would be cool.

When I told about putting Jango in the dark corridor before the factory scene, I tought more about showing him coming from the left side with his gun pointed at Anakin and Padme (and cut off the geonosians coming out of the walls). Like: Anakin "I sens something". Jango appears "Now you'll follow me, Jedi scum!" (or something like that). Then a wipe to the deleted scene with Padme, Anakin and Dooku.