Fender retainers for '98?

Hey I'm a XJ newbie. I just bought a 98 XJ SE. I took the fender flares off to paint them and as usual all of the bolts broke from rust. I went to the dealership and they said they could get me new metal retainer clips, but the ones they got in were from crown and they were for 96 or older XJs. I may just try to drill the old ones out, but I would love to get new OEM retainers. I have my RE 3.5" lift, new front brake pads and rotors ready to put on soon.

On mine i ground the stock broken bolts off the retainers then drilled a hole straight though. Then i welded a new screw in the retainers. If you don't have a welder, epoxy could work too i suppose.