If you are looking to focus on high end 2 channel I would consider a dedicated single disc cdp. I like the Cary cd-308 but if you like Classe a used cd-10 can't be beat. Keep your dvd a seperate unit.
I like the artistic layout of your gear. You will be amazed at sound improvement by replacing the particle board shelves in your nice looking rack with tempered glass, marble, or corian.
Good luck,
Mike
