If you can knock the pins out with the door shut without damaging the paintwork you could try swapping the top and bottom pin over.
The wear is likely to be different on top and bottom pins and sometimes does the job.
Or swop from passenger side to driver, as they receive much less wear
