I had a NAIM CD 3.5 and added a Flat Cap - I felt that it made an improvement - which is not all that easy with these high quality players. I still mention the ARC CD3 (which I know own)becasue it would seem to be well matched with amp and preamp.
I'd be thinking about an SACD or Cary CD player (top-of-the-line with upsampling) and I'd ditch the Kimber and stay with HT Magic IC's (too much RF in your neighborhood). Otherwise, I think you're there brother! Well, O.K., Throw in a Martin Logan Decent subwoofer...