Tuff decision, need help

Hello folks,

I've recently purchased a PSB GOLDi, to match a McCormack DNA-1 and McCormack TLC-1 pre-amp. I also have a Sunfire subwoofer, but I rarely use it.

The thing is that, although I'm close to satisfied with the PSB's, it is very far from perfect. My main complaint is the lack of clarity in the highs, and the muddiness on the bass side.

I was considering trading my PSB GOLDis (new edition) for a pair of used B&W Matrix 801, old as hell. I always liked B&W but never have gotten the chance to acquire one.

Do you guys think the trade might pay off? How about the amp, will it be enough to drive the power hungry 801?