I asked Tim and he suggested Nailbomb when I described the sound I'm after, as it is a bit edgier but with sweeter top end than the stock pickups.
yeah, the bomb is edgier and Tim seems to prefer it over the diver for most applications, but I personally prefer the holy diver for most things that he recommends the nailbomb
the diver is a lot fatter and smoother for leads
I liked the nailbomb too, but it was too edgy for what I was looking for
if you want tightness and aggression over thickness and smoothness on leads, then the nailbomb is the way to go
the holy diver is fairly tight too (tighter than the JB)