I have the same listening tastes as you, Dr.!
Having bounced back and forth between Solid State and tubes over the years I can say that I am never truly happy until I have a tube preamp and power amp together in the system. In my experience having a tube preamp with a SS power amp only gets you 1/3 of the way into tube heaven from a sonic perspective. The Power amp makes the biggest difference. Perhaps small tube monoblocks like the Mid Monos from Quicksilver are a great way to go. i own a pair and love them. They are $2000 the pair new so you should be able to find a used pair within your budget. I see a pair, listed at $1200 just sold on USA audio mart. they do come up from time to time.
Consider that you got 3 decades of use. Much gear made nowadays likely won't be that durable. Those Quicksilver Mono are still hand built, wire point to point, and will probably last the rest of your life. At 40 watts a channel, in your small room, that should be sufficient power for all but the most inefficient speakers.
Not worth fixing the CAL CD player. Digital Audio has come a long way since then. I used to own one. Great at the time. hard or impossible to get serviced now.
I would say continue to use your current Phillips CD player and if you have the urge, jump into streaming, maybe with something basic like a Bluesound Node. You will be amazed at what that opens up to you.... your CD player will probably start gathering dust. Good Luck