The goal with the factory is be to make it look less like a Mario Bros game, indeed.
Worst scene in a Star Wars movie along with the "forbiden love by the fire" one. And they are both in the same episode...
About Jango. Maybe we could use him in the dark corridor before the factory scene. He would appears behind Anakin and Padme (flipped shot and some rotoscoping effect. Don't know about the perspective though, I need to check that) and next scene we see them in front of Dooku in the deleted scene.