For context on C-3PO:

Current Episode I edit: (before the podrace)

“You’re quite right, space flight is perilous… I didn’t exactly leave my last starship assignment in one piece.”
“~~Oh my, space travel sounds rather perilous. I can assure you, they will never get me onto one of those dreadful starships.~~”

Current Episode II edit: (leaving Tatooine)

“For a mechanic, you seem to do an excessive amount of thinking.”
“~~I’m not worried, R2. It’s just I’ve never flown before.~~”

New Episode III edit: (leaving for Mustafar), I’d suggest…

“Miss Padmé, I’m certain Master Ani will be quite alright.”
“~~Do you know? I believe I’m beginning to get the hang of this flying business.~~”

Another thing that I don’t know how easy it would be to fix in Episode III, in your edit R2 was removed from the birth of the twins, but his reflection is still in the glass.