If you are interested in line stage only, another one to look at for well below $1k is JuicyMusic Merlin.
http://www.juicymusicaudio.com/juicymusic.htmlWhile I don't have direct experience with this actual unit, if it is anything like my Blueberry Extreme, it is worthy of consideration. Excellent build quality, and superb customer support.
I notice your analog setup uses separate phono section.
For line + MM, you can get the Blueberry or BB Xtreme for under 2k.
Another $500 will get you the Cream MC option.
The BB will give you the tube magic you seek, and still offer good drive and transparency.
You can probably get this for close to breakeven by selling off your current line + phono section + i/c.