Best upgrade: amp or pre-amp?

My initial impression is first step if preamp or amp is the amp.  And depending on your budget there are some excellent integrated amps

The second thought I have is if you can listen to different manufacturers.  All pieces are slightly different.  I've owned and love McIntosh.  I also appreciate other brands both SS and tubes. 

agree, get rid of both and buy a decent integrated. There‘s lots to choose from, some good ones have already been mentioned. If you aren‘t after big power the Leben CS600 is pretty special.

@erik_squires & @webking185 : ll fair points on the Luxman. I need to listen to it to forge a real opinion. I know it is very-well regarded. 

@yyzsantabarbara . Yes, the Sopra have Beryllium tweeter, and the Krell K-300i is one I definitely have my eyes on as well. 

Thanks all for your suggestion so far. Your feedback make me realize my initial tough of replacing both pieces by a good integrated was the right one. I'll add the Krell and Luxman to my short list. But if I got down the integrated route, the MA8950 would be the default contender as I'm very please with SQ of my mac gear.

Evaluating alternatives (Krell, Luxman, Hegel or Pass Labs) is always tricky for the usual reasons: not available to test in Montreal areal, different speakers, different room, ... I wish it exist a service to test any gear at home for two weeks, even for a fee!

@papyneau , McIntosh MA8950 is a fine choice.  Figure you have this brand already and would like to try something else.  I think the Luxman is a better match for the Focal Sopra 1.  Maybe you can demo in stores?  If I had to choose, Luxman for sure, either the 509 or 590.  The 590 is on my list for sure.

OP:
 

I don't want to bias you too much, but there was another recent thread on Mc vs. Luxman here as well.  Listen for yourself, but of all the possible comments I could see thrown at Luxman, analytical or cold are not the one's I'd use.  Certainly not what I'd buy either. :)

Best,

Erik