I would definitely change the amp; it is not a particularly "musical" component. Contrary to other posts, IMO it is much too analytical and clinical for your speakers.
I would also look at the cd player, speaker placement, and room treatments as well.
I would also look at the cd player, speaker placement, and room treatments as well.