I just picked up a Besttop Trektop. No more factory hardware (mine was a mess of ill-fitting replacement bolts. Top fits tight, looks great, and includes everything you need (door surrounds, header bar, rear retainer clips and retainer bar).
Plus, now you have a top and safari top in one!
Included before and after.