Tubed Pre versus Integrated? $2K USD range.

I want to make the move to tubed audio. I have about $2000 USD to spend. I want to buy new as I have had too many bad experiences buying used audio equipment. I currently run a rebranded 1990s Pioneer Prologic receiver as a pre-amp into a solid state 100WPC amp, to a pair of JBL LX-500s. I also have a self-powered sub.

My quandary is, do I buy a tubed pre-amp in my price range or do I buy a tubed integrated with variable out; run the JBLs on tubes and the sub on the variable out?