Swap out b&w 802 d3 for Sonus faber amati g5?

I have experience with both brands in this price category. I would recommend a demo of Wilson Audio in your price range (lots of used one out there too).  Both wilson and Sonus Faber will be more neutral than B&W. The Wilson are almost always more dynamic in the bass (harder hitting leading edge) than Sonus Faber and everything else is pretty comparable between them. 

you  could compare these in your selected price range:

https://speakerchoices.com/

definitely go with the SF much more musical and natural than B&W

you got my vote for the SF much more musical and natural sounding than B&W, also the monitor audio platinum is even better than the SF much more three-dimensional and airy and spacious sound stage.