Is it at all possible to just have R2 and C-3PO just stay in the ship on Geonosis rather than having to endure the bumbling droids during the fight scenes?
This way the only effect that they actually had on the scenes, namely R2 stopping the molten metal from killing Padme could be seen as just a lucky malfunction.
And I'd lose super-bouncy-ball Yoda and just have the force lifting end their battle. It's much more Yoda than that bizarre wildcat saber fight.
I compliment you on the rest of your decisions.