Saddlebag Latches - KZ1000p

I've been riding an '02 KZP for about a year and I love it. There is one thing though. The square latches to the saddlebags are worn out. I've found that at highway speeds my left box will pop open and stay open unless I tape it shut. Does anyone know where I can get new latches that match the old ones? I've looked, but I can't seem to find them. They are like the one on the side of the top box at the top of the picture. Ignore where I'm pointing.

I have seen them on ebay. I seem to recall that they wanted $30 each. I have a KZ1000p7. I have the older stile latches that look more like this. www.etsy.com/listing/231406150/tool-box-...2IM7VsU3YaAgfa8P8HAQ

They were worn out as well and would not reliably latch. Replacement latches of this type are also a bit spendy, so I just removed them and rebuilt them. Some of them just required a bit of metal bending.

I have both style of latch... The newer style definitely tends to pop open, there's no real hook action to them, so they just slide of of that little shelf.

The old style works better, IMHO.

Here's the thing about both: they're just riveted on. You can drill out the rivets, remove them, and reinstall them with whatever kind of spacers you need to get them back to mating properly. Unless something is actually broken, you probably don't need to replace them.

EDIT: To be clear, the problem is usually that the bag has changed shape over the years (it's just ABS plastic) and not that the latch itself has changed. A new one mounted in the same way as the old will also likely fail to stay latched.