Upgrade to B&W 804 D4 Speakers

I agree with comments, with a budget of $16k you can get a lot of speakers.

Canuck Audio Mart is chock full of speakers, some barely used, usually much lower price than new. 

I personally try to buy nothing new. Most stereo shops also have lots of used gear you can audition.

B&W seem to be power hungry, and not a good match for tube amps.  

Ask Chatgpt about amps to drive B&W, see what it says?

In that price range, you might consider Fyne Audio F-703s or F-702SPs.  I have the F-702 ( not SP model) with two Rythmik subs with a Rogue RP-7 preamp and Odyssey Kismet mono-bloc solid state amp.  Wonder music presentation!

Agree with the above posters.

I use the 803 D3.

They can play loud, they play clear, they are dynamic, they love power.

I'm driving mine with PS Audio M1200 mono blocks 

They are bright up top. The fix for that is no toe-in (face them straight ahead).

My system is posted if you want to look it up.

I've had 805 D4 for almost a year now, great speakers. Feed them properly in a decent room and they are awesome. There may be some tube amps out there that might do them justice, but a 250+ watt A/B amplifier works best. Just my 2 cents.

Go for the B&Ws but pick up a nice amp. Pass X250.8 or Int250 if you want integrated. Should be a good match.