For reference, here are l8wrtr’s takes on the droid factory and garage scenes (I think of the edit’s I’ve seen, his were most successful in editing down these scenes):
droid factory: https://drive.google.com/open?id=1L3RMhiG8debz1CUCKgM0gYHrHrN0MUME
garage: https://drive.google.com/open?id=1pHLbsJiDweog5gohQGNZTS5ZIuVI4FvX
Personally, I would vote to add the droid factory but keep the garage scene out.