At this point, I have pretty well decided not to upgrade my 2.0 music system until I have saved up at least $3000, at which point I will completely replace it.
The idea of a one brand system appeals to me. Speakers, of course, are the top priority. What companies that make good speakers also make a CD player and an integrated amp (or an affordable preamp/power amp?) I know about Rega. AudioNote is another, but they are hard to find, and I don't know about tubes. Naim is out of my league, pricewise.
(Oh, and CDP + powered speakers is another option.)