My guess is that if you would change your cd-player, your disc player is an underperformer in your system, you will gain a lot of clarity. Buy something with a fresh, crisp sound, like an Arcam cd 23T for instance.
I agree with Timrhu on the headphones.
Your speakers me be a little to relaxed for your taste, but buy a good player first!
