What speakers do you recommend? I'm considering B&W 804 D3 or Sonus Faber Olympica II

My current system consists of mostly older Primare components (SP31 processor, A30.2 amplifier, T23 tuner, and I’m using a Denon DP as a transport), Audioquest cables (Mont Blanc bi-wire (two run) speaker cables, Eagle Eye digital cables, NRG 5’s and NRG 3 power cables, and Jaguar XLR interconnects), and Polk Audio LSi-15 speakers. I am looking to finally upgrade my speakers.

The B&W 804 D3 sounded good in the show room, so did Sonus Faber Olympica III. (I feel the Olympica III is warmer and more extended in the highs, and the 804 D3 is cleaner and more involving in the showroom setup.) The Olympica III’s bass is a little big (in the showroom), so I am deciding between Olympica II and 804 D3; but the dealer here does not have an Olympica II, so I cannot audition it. What are your experiences / recommendations between these two speakers? (Of course, you can suggest other speakers in the similar quality/price range, and please feel free to suggest other improvements as well, though my primary interest now is between these two speakers.) Please let me know your reasons for your recommendations if possible.

Thank you all so much!
Leon