Hard to disagree too much with that. Let me sit on this for a bit, but I do like it and it makes good sense.

I’m leaving away from the droid factory action sequence, partly because I’m hoping to cull a line from it for 3PO to replace his line as they leave Tatooine. And, reviewing Q2’s edit, he manages to include the deleted scene sans action sequence and keeping the Senate scene following Dooku’s conversation with Obi-Wan. Sure, Anakin seems meek, but I’m sure as part of the diplomacy angle he agreed to he needed to surrender his weapon. Then the bad guys screw them over.