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.