If you think you want to spend time building your system piece by piece and experimenting, then the CAL may still be a good deal, as it will probably hold its value if bought used. If you are searching for true audio nirvana, the "as near as possible to the live event", I cannot more stongly agree with Redkiwi's post. Try to get neutral components. Just realize the slippery slope many of us (myself included) are headed down. (Albeit an enjoyable trip).
One more thing Redkiwi alluded to. Room acoustics: If your room has alot of glass, hardwood floors, framed art (with glass), or a lack of soft furniture, this makes a VERY big difference in the sound , turning the sound bright. There have been a lot of threads on room acoustics in the past, done much more eloquently than I can, so check them out. Alot of tweaks in this realm are cheap, and many are visually pleasant as well. That aside, I still think the CD change will help alot. Best of luck and happy listening.