Test run of changing 3PO’s dialogue:
Personally, I think the dialogue still makes perfect sense this way. And like I said, the whole situation with 3PO and wasting time going to Kijimi feels much less contrived now.
EDIT: Didn’t see that Hal already vetoed this before I made the mockup. Oh well. I’ll add it to my personal changelist.