Keep that garage scene out. Simple. 😉

As for the droid factory scene mentioned again, just watched it on youtube and I don’t see a way to even trim it to “make it work” it a believable and seamless way. Even if you took out all the 3PO moments, you have some brief shots of R2 at the door by himself that shows no path way or bridge from it … then he somehow gets to the controls later?

It’s too much of a mess. I do know what you mean about the transition with the inserted deleted scene with the “negotiation” scene. Not a strong scene, but it’s the only option.