The extra shelf is a must...maybe some bright star isonodes ($12.50) are worth trying out w/ the cdp. PS audio ultimate outlet would probably help the amp out some, but I would save the $$$ on that and try to get a pair of Sonus Faber concertinas or maybe some totem monitors. I'd probably listen to the PSB stratus minis also in that price range.
