upgrade dilemna

I have been using a Harmon Kardon AVR7200 as a pre for a Mcintosh MC352, I use a Behringer DEQ2496 for room correction and DA conversion, Tyler accoustic PD80s as fronts. I also have a HK DVD25 which I use as a transport for cds. I am only interested in a two channel setup.

I realize my weakest links are the DVD and using the HK as a pre. The system sounds fairly good but I feel I could use a little more detail. What would you recommend... a dedicated CDP for music or a different pre? Also which makes and models would you look into?

Thanks for your time.