Structurally, that's where the reveal fits... My immediate thought is that you could cut the Gungan battle down significantly, rather than excise it completely. After all the battle is a diversion-- it doesn't need to have so much screen time.
I wonder if there is a way to do away with the ruse of handmaiden or Queen altogether...