I agree, a new line playing up another of C-3PO’s character flaws could work just as well.
I’m personally fine with Poe being an ex-spice-runner, but I can appreciate why you’d want it gone (it’s not a very good idea to begin with) and changing it as described would work well, I reckon.