You have the right answer. I have several of those in the fleet, and I stock the latches. The first time that the door doesn't close, we replace the latch. The plastic is just going to get worse. My dealer has them, so they must be available. Login to read more.