When I rebuilt my CJ I went with a Stainless Fastner kit from quadratec. It has ever fastner that you would ever need. It may seem a bit expensive but you don't have to worry about scrounging around for fastners in decent shape and if you put a dab of anti-seize on them you will not have to worry about them rusting in place. Not to mention they look pretty snazzy too.
Even better about the stainless bolt kit is that they replace those crappy torx bolts with Allen Head bolts where applicable. Don't forget to use anti-seize on the threads.[addsig]