Recommendations for HiFi Listening Room

Your room size is not going to be the problem. Quoting John Atkinson (Stereophile)- "Big room, small problems".

Take your time and enjoy the journey.

I wanted to "just swap my speakers" 2 years ago. I ended up with a new (used) amp and turntable, new cables - kept the CD player (but stopped listening to CDs) , to improve/accomplish perfect synergy. I'd say i am further from it then when I started and it is normal.

I was convinced that it was all about the speakers. I had to spend the most on speakers and I had to find the best sounding speakers for the money (or twice the money) I had. 

I would stay away from advice of a specific brand, I would start with cultures, regions and countries. Unless you buy a "Ford" you will find that every boutique shop will have a specific DNA and the results will vary accordingly as they may or may not match you visual and technical and sound requirements. 

Scandinavian, British, Italian, Swiss-German, US-Canadian, all very unique and fantastic choices and camps . 

I would say: spend half your time reading up on it, and youtube videos, and the other half listening. This forum was gigantically helpful for my turntable and speaker stands and a complete beehive and clusterf%k for speakers. 

To paraphrase a quote from a great movie: figure out your priorities and then question and validate them. It will be a fun journey.

Your room size and listening preferences will determine how much power you will need, your budget will determine what brands you can buy and you should listen to/consider the amp and speaker as one choice and the source independent from them. (Or I could be totally wrong about this, and everything I wrote!) :) 

I also like wildly different music types and after years of attending the symphony and other acoustic venues found that Sonus Faber speakers best reproduced natural - musical sound, improved all genera (as opposed to making one genera sound better at the expense of others), and when coupled with good tubed equipment (Audio Research) have me (and my female partner of 37 years) happier than ever (understatement… first time she truely loves the sound).

Among brands that are more commonly found out there in stores, definitely try to listen to Vandersteen and Sonus Faber.  But just because a brand is stocked by a bunch of stores (B&W, Focal, Paradigm, etc.) don't assume that it's best bang for the buck, or the best-sounded speaker for your application.