It has always seemed to me that the Abraxas is a bit ignored here. I think that may be because it's too easily associated with Santana and while that's not a bad thing, I've always had the impression that it's far more versatile than this might suggest. It has always seemed to me that if you want a really hot PAF tone, the Abraxas has to be worth a look. Now in fairness, I've never actually tried one so someone like Nolly may be better qualified to give an opinion but based on my understanding of the description, the comments I've read here and the clips I've listened to, the Abraxas has to be worth consideration. In actual fact, I was thinking of either a calibrated set or an Abraxas bridge with a Mule neck. My rationale for this was that as soon as you mentioned Bonamassa, the consensus of opinion was squarely in favour of a Calibrated set of Mules so it stands to reason that if all you need is a bit more power to that basic tone, a calibrated set or one of each was the logical conclusion. If, having heard the clips, you feel you need a hotter, more 'Metal' bridge pickup, I'd maybe consider an Abraxas neck with an Alnico V Nailbomb bridge. The Nailbomb is certainly a 'Metal' pickup but it's also very versatile and by sticking with an Alnico V magnet instead of ceramic, you'll keep an element of PAF tone in it and the versatility you need. So, to summarise, I'm fairly convinced that one of these three options is what you need, depending on where your priorities lie:
1) Abraxas bridge and Mule neck
2) Calibrated Abraxas set
3) Alnico V Nailbomb bridge and Abraxas neck