The whole Padme subplot could have been dropped entirely, IMO. But then, I'm not a fan of the character - were it not for Luke and Leia needing a mother, she could have been dropped from the prequels entirely without much impact.
Not too get off on a tangent here, but your wife kind of looks like the super-heroine Hygena from So You Want To Be A Superhero?. I hope I didn't reveal her secret identity...
While IMHO attack droids should be remorselessly efficient killing machines, I'll admit their antics did make me laugh.