Yeah, good shout Peter Pan, especially on the lightsaber fight reordering. It’d feel a lot more punchy if we took out that moment of downtime where Obi-Wan’s just waiting behind the gates - it should be that they drop while he’s at his most emotional, prompting him to fight in a way that Maul then exploits to quickly send him down the pit.
And regarding the Padmé capture, I do have a shot available which bridges those two scenes. By zooming (aggressively) on Gunray turning toward the door (originally after it opens) and playing the door opening sound effect, we can then transition to Padmé walking in, then continue from the next part of the zoomed shot (but unzoomed this time).