Ok.
Semi crazy idea but…
Imagine the Droid factory with Padme removed.
It would take effects work, but if you paint her out of a few shots in the initial hallway (including removing her from the shot of the doorway.)
Skip the door closing/platform-withdrawing/Anakin hanging shots.
Use the Shot of Anakin jumping down. It looks like Anakin runs through the door and immediately jumps down, with the battle continuing.
The rest of the shots of Anakin can be arranged and strung together, leading up to being caught by Jango.
That way her and Anakin are captured separately. The sequence serves a purpose.