Go to eBay, search for member RubiconRecycler
He has a tooooooooooooooooooon of Jeep TJ parts... down to hardware...
I am not advertising for him, but I definately watch his items, and have bought a few things from him.
Right now he has over 1000 listings, I have seen both parts you are looking for before...
Hope it helps.
Tony