Sonic Frontiers to Conrad Johnson .

I have a Sonic Frontiers Power 2 amp and Line 1 Pre-amp hooked to B&W 801 III. I want tube sound- warm, rich, liquid. I don't care about accuracy, I want the sound to be inviting like I remember from long ago. I don't want the stereo to drive me from the room. I changed the tubes in the Line 1 to Brimmars- it helped but did'nt go far enough for me. I also hook up the PS Power Plant 300 to the Pre-amp and while making it a little more dimensional seems to lean out the sound. The question is what brand of equiptment would you trade the SOnic Frontiers gear for to give me the warm inviting tube sound that I crave? I'm leaning towards a Conrad Johnson LS16II for a pre-amp. And perhaps replace the Power 2 later w/ a CJ amp. Any help would be appreciated. Thanks.