You could replace R2 with BB-8 perhaps! I do feel like not having 3PO fire it is a bit of a missed opportunity.
Too bad it isn’t R2, though. Maybe you could’ve made an aggressive negotiations joke. I like the idea of 3PO trying to follow his baseline programming, and perhaps try and negotiate for Chewbacca’s release or something.
Yeah, BB-8 works too - although I’d have to figure out a quick-to-describe way for him to shove C-3PO’s elbow, since he’s too short compared to R2. And honestly, having C-3PO laden down with weapons, and still trying to politely negotiate his way out of trouble, almost works better for this new, even more naive C-3PO.