I just watched v2 of your edit. I think it is an improvement over all. However, I’m curious why you decided to reinstate the droid factory action sequence.
My main reason was that rewatching the movie, I felt it was a bit abrupt that Padme and Anakin just sneak in through a side entrance and in the next scene they’re at the table with Dooku. Why not go in through the front door then? What is their plan?
After that, they seem to give up immediately on a diplomatic solution and are captured in like 20 seconds. The fact that Anakin doesn’t break out his saber at this point only makes sense if he’s been disarmed, but we don’t really have anything to imply that without the previous scene of them being cornered and captured by Jango.
I’m not a big fan of the droid factory, but it just felt like there was something missing.