I still prefer SSWR's take of the droid factory.
In the original version Anakin does not sense the Geonosians all around him (these are living things and connected to all other living things by the Force)
In SSWR's version he triggers a mechanical device instead (because he is reckless).
It feels like Padme is implausibly avoiding less obstacles (she isn't a Jedi) and he loses his saber (why would Anakin charge into a fight with Geonosians but surrender to Fett and some droids if he still has a weapon to hand?).
I prefer your choice of musical adjustments though.