Recommendations Wanted

Sell those B&W's and get a pair of Quad 57's. They will match well with the Mac amp and Fisher preamp. Just the right amount of power too! Your music choices will suit the 57's well!

Your budget, amp, taste in music, and volume all combine together to strongly recommend Tekton Moab. Mine are simply superb with all types of music, I am mostly classic rock but love jazz and classical now more than ever and this is all due to these exceptional speakers. 40 tube watts is plenty, I'm using the 20W Raven Blackhawk now and even that is more than adequate to reach quite high levels. Measured 102dB at my sweet spot 9 feet away in my 17x24x9 room.

Moab absolutely disappear in the room. Set up well with good ancillary components they make the room disappear in the music. Ignore the haters, just read them to understand how irrational they really are. 

The one downside, Moab are large. If you want smaller then go for one of their smaller models. I have heard several of them now, the full array models are where the magic lies but the DI is end game for a lot and for good reason. 

You will have to wait to get them. Unlike all the lesser speakers others will recommend Tekton are in such high demand the wait times are several months. Unlike the speakers others will recommend that are supposed to be good there are virtually none for sale used. How come if someone says a speaker is so good there are so many for sale used? Riddle me that one, Batman. 

Check out the FB Tekton Owner's Group. There you will find very knowledgeable, helpful and friendly audiophiles rich with Tekton experience. What I have told you is only the tip of the iceberg.

I might sell you my Tannoy FSMs for $5k. 94+ Sensitivity.

Love tubes. Love Jazz. Crossovers rebuilt by Danny Richie.

Big but still disappear. 

I love your system! As far as speakers go check out the Volti Razz, a bit above your budget but excellent and sensitive speakers.

Start with Klipsch Forte 4.