I'd also keep an eye out on craigslist for the ads that are parting out old tj's. There have been a couple here in the Minneapolis area over the last few weeks.
Yeah, you may have to find something generic for those clips. I've searched high and low, and it doesn't look like Mopar makes them any longer. But, it's got to be a fairly generic clip that's used across many vehicles I would imagine.