Heck just go all the way and shoot actors in mandalorian costumes and put them into TPM. It's what most of us thought we'd see anyway.

Or just get rid of the battle droids speaking.

Wait, when you say droids in the hangar, are you talking of the federation ship hangar?

Ive never liked that shot showing all the droids looking at the ship landing. I like an empty hangar too.

And TC-14 should be 3PO as the federation has binary load lifters right there in the hangar bay when the jedi hop out of the vent.