I know what you mean about OEM buckles. I have that some kind of obsession. I have a set of vinyl bags with vinyl straps. The buckles are metal and still good. To replace the straps I went to my local Goodwill to look for leather belts.