Magoo,
It seems that you have spent some time and plenty of good coin on your system. Also, you have a large speaker system which needs to be controlled and driven cleanly or they will not boogie with crisp and lifelike precision.
CD players sound different but also perfom differently. If you plan to really listen mostly to rock and pop, I believe you need a design that can control and properly pace the music no matter what music type you listen to.
I too have built an all purpose stereo system and listen primarily to redbooks and the redbook layer of hybrid sacd's. So far, I have been very content with my my modded Wadia 861. Good luck and have fun!