My vote is to keep out the garage scene completely and use l8wrtr’s version of the droid factory scene (or something similar).

The garage scene is unnecessary because, without it, it’s never actually established that Anakin killed the women and the children, or even all the men. For all we know, he could have simply killed the ones responsible for his mother’s death, and any others that attacked him as a result, before the rest ran away. And I don’t think Anakin needs to be shown expressing guilt if he only went after the ones that tortured and killed his mother.