I'm thinking of resetting the whole system and going with low power tubes and high efficiency single drivers. Thinking that with my SPL limits, might give me what I'm looking for.Good idea, although I would not limit myself just to single drivers. Ref 3 makes great high efficiency speakers with a very simple crossover. If you budget will allow, Hornings are high efficiency with a wider band than most single drivers. Good lower power tube amps can be had for a reasonable price from Atma-sphere, RM Labs, and lots of others. Just remember that SETs make more distortion as their output goes up, so if you go that route, make sure you account for the peak power demands of your listening habits and material.
On the digital route, developments have been dramatic with respect to computer audio and dacs. Not sure an investment in a high end CDP makes sense any more. Ripping a large CD collection is a project, but if you get a music server that auto-rips, you can do it while you watch TV or do other chores. Lots of good info @ computeraudio.com.