stay with the redbok player. Chances are very high that most of your listening will be redbook, so that's where you should focs your energies. I concur ith the Naim CDX2, especially since you can always add-on the XPS.
As for a ML 39/390S, I had one for several years, and while it's a marveous player, it's really much better with a good preamp in te mix. I was unimpressed with the Esoteric universal player.
I would add Ayre CX-7 to your slected upgrade choices.....
