A few other things I'm not a fan of:
-Nute Gunray's hologram popping in, saying "They must be dead by now." and then popping out. That line comes off as really random. Maybe cut out the hologram entirely, and just have the droids arriving at the door?
-Jar-Jar saying "This way! Hurry!" By the time he finishes saying it, the Jedi are far ahead of him, and obviously ignoring him.