Keeping part of the droid factory is probably the right call here and most of it feels seamless, except for the bit with Anakin nonchalantly releasing Padme from the cask. I wonder if it wouldn’t be more effective to imply that it was the Geonosians who released her, since they immediately surround her anyway.
Other than that, great work!