Hey TJ! Hey Erik!

Remember that with the 3PO story, in the rough cut, 3PO stays in the ship. R2 rolls over to the panel and saves Padme from the furnace, and then we forget about him.

Replacing the original dialogue (indicating that Anakin built 3PO) would not change any of that. There is no way I am reinstating that head-swapping fiasco...

It's just a question of a good story overall. I would prefer it if everything weren't so closely-knit. Yoda knew Chewbacca. Darth Vader built C3PO. Etc. Etc.

But for the question of 3PO, I don't see an effective workaround given available footage.