Upgrade Reccomendations

Some ideas

Speakers:  big open baffles or planer speakers will not work in that small room.  You like EDM so efficient speakers are a good idea.  Klipsch Forte and a couple subs ~8000.  There are other efficient speakers but these are the smaller ones.  If you want smaller, Fritz are easy to drive, if you like it loud then you need the bigger ones.

Preamp:  Lots of choices.  Don Sachs, Suprarek, Aric are about 2500. These are tube.  Have to watch gain on efficient speakers.  Some have variable gain. There are nice passives, Hattor, Khozmo, etc. 2000 or less.  I use a custom passive buffer with Tungsol 12AU7.  

Amp:  I like Class A: Sugden A21 or higher, Pass labs, Luxman.  3000-10000.  Tubes; Dynaco, Dennis Had, Raven, Rogue 1500 to 6000.

Streamer:  Don't know about streamer.  You could update DAC.   There is the most debate and possibly least difference.  Too many to list.  2500 gets a good one.  

Room treatments: need 'em.  GIK.  2000.  Corner bass traps, first reflection, diffusion.  No hardwood floor, put a rug down if needed.

Tweeks, etc: Isolation on components.  100 worth of springs or much more if you want.  Proper positioning.  Many more to choose from.

Did I spend too much?

Lots of great I formation and ideas, thank you very much. I tend to be impulsive, so slowing down and taking my time can be a challenge at times. I plan on listening to some different amps and speakers to see what my ears like and slowly upgrade. I will update choices along the way. Appreciate all the insight.

john

OP, It's always hard for me to tell until I try something out, but if you are moving to one of the spare bedrooms at 11 x 14, that may give you lots of options on tube amplification as you might not need that much juice/power in that room. 

The only recommendation I have is to be open to buying, trying and returning until you find the new piece you like the best in your room and for your tastes.  It's totally possible to land on a great upgrade in one swoop, yet often I find it takes a little trial and error.  

Enjoy your research and journey!

The Matrix 804s were, and are, perfectly good loudspeakers. That generation of B&W's were not as power hungry as the current D series. The 605s are not great sonically. I presume you still need the hybrid tube amp for your headphone setup, so I would just look at getting a better amp for the 804s.  I'm not familiar with your preamp, but it might be worth considering replacing power and pre-amp with a good tube integrated - for example a PrimaLuna. That would allow you to get some kind of return from selling the pre and power together.

A pair of 2 way stand monitors might work really well, and they usually don’t cost as much as a full range pair.  Then bring in a subwoofer if you need it.  Since this is a dedicated room you’ll be able to place everything according to sound performance and completely disregard aesthetics, maybe go wild with some acoustic treatments and a fog machine :-))
 

Might also be a good opportunity to go with powered speakers as well since you’re rebuilding.  

I think that changing speakers is a much bigger risk to your future happiness than upgrading the amplifiers. The first question to be answered is if you love your speakers.  If you do then you should keep them unless you can audition some others and know that you like them better rather than thinking that you will.

I hate headphones. You listen to music and feel nothing. 1/2 of the performance is AWOL. I have no use for them. 

As for your system, it is a potpourri of mismatched equipment. B+W speakers are not bad but, like many American speakers their performance is amplifier limited. You need a high powered class A amp to really do them justice, something like a Pass XA200.8 or Parasound JC1+ or Atma-Sphere MA2s. Everything else can be upgraded in time. Unfortunately, this can not be done with $5000. My advice would be to cool it with what you have until you can afford to do this correctly otherwise you will be spinning your wheels and wasting money for minimal improvement.

First of all, congratulations on your headphone journey and acquisition of a room. I went down the headphone rabbit hole again about three years ago (see my UserID for systems). I did such amazing things to my headphone system that it actually sounded much better than my main system. The final introduction of a massively powerful 300B amp just took all of my headphones and satisfied every aspect of what they needed… the Focal Utopia for incredible midrange bloom and the Sennheiser 800s for massive power and warm natural sound. Darn, my main system sounded analytical and sterile.

About $100K later, replacing most of my components… both systems are the best most musical, detailed, wonderful systems I have heard.

From the sound of your post it sounds to me that you are still trying to keep this opportunity contained. It sounds to me that you may have audiophilia and are in the closet. Sounds to me, I could be wrong of course, maybe you want to architect this from the ground up. Just a wild guess. 

I think you should first think about how you will treat the room.  That will completely alter future thoughts about speakers and amps.

Any of the Spatial Speakers would be a stunning match for your gear! M3 Sapphires are the best speakers I have owned.

It looks like amplification is your weak link, not your loudspeakers. The B&Ws need some power and maybe a little more warmth and musicality. I’m thinking a Rogue Pharaoh II Integrated Amplifier.