I think you spent to much on the CD player and not enough on the amp maybe.
But that is just my opinion. For that money I think a CEC transport with the Naim super nait would be better. This is just my opinion.
But still you have a very beautiful setup.