Hello,
You may not know about the new Lumin P1 all in one preamp/ streamer/ DAC. It has been said that it is almost as good as the X1 in sound when streaming due to the ESS pro chip. It is not inexpensive but at 10k it is cheaper than the Lumin X1 and you get a great preamp to go with it all in one really nice looking chassis. It is so good some are wondering if this will hurt X1 sales. I am not sure where you are located but this dealer in the Chicagoland area might have the first one to demo.
holmaudio.com.
if you are not in the Chicagoland area hopefully your closest dealer has a demo to listen to. Since you are talking about changing some of your gear you might give this a listen. Holm Audio is also a dealer for Puritan. If you have not demoed the Puritan PSM156 power conditioner you are missing out. Also, Now you can upgrade this with the Puritan GroundMaster City for a plug and play option to upgrade your ground. Believe me you have not heard your system until you have heard it with the Puritan PSM156 and the GroundMaster City. Remember all of your great music is recreated using the power from the wall. I hope this helps and that you have a place to demo these amazing products.