How about this?

The queen lands in secret and after her meeting with Gungans the Jedi take the ship to negotiate with the Viceroy who is still on his ship.

They try to kill the Jedi with gas and droids but they still escape, this is inter-cut with the Gungans fighting the droid army.

The droids defeat the Gungans who surrender, the Viceroy lands claiming victory.

Padme's team storm the palace allowing the royal flight (and Anakin who deliberately jumps into a ship) to escape as the Jedi face the Sith Lord on the command ship and the royal flight take on the blockade with Anakin destroying a communications jamming ship (not the command ship) deliberately.

Threepio transmits the ships surveillance back to Coruscant who send a taskforce.

Padme captures the Viceroy who orders the droids deactivated.