Preamp upgrade opinion...

I would look at upcoming Modwright SWL 9.0 Anniversary Edition preamp. It is targeted to sell below $3K and will be a 5687 based single-ended line stage of all-tube design, with choke-regulated supply, Home Theater Bypass and integral headphone amp.

You can also add phono option for $350.00. 

Speak to Dan at Modwright and he will happy to answer any question or concerns. 

I have a Pass X250. I used to have a MW SWL 9.0 SE and I really liked that pre but being singled ended was a little too noisy on the Pass. You're pass wants to run balanced so I would caution not sticking with a balanced preamp. I moved up to a MW LS36.5 and it's in another league honestly. The LS36.5 works and sounds great the X250.

I listen to much of the same types of music you do and the LS36.5 has great PRAT; pace, rhythm and timing. You can probably pick up a used one in your budget.

I came close to picking up a Pass X10 which gets great press in its price range and you can find them used at Reno Hi Fi in your price range. I went with the MW primarily because I really liked my SWL. Don't miss the SWL at all honestly as the LS36.5 is so much better.

Meant Pass XP10... not X10