Hello to all, this is my first post, forgive me if this is in the wrong section...

I am looking to upgrade my CD player, having a collection of over 1000 titles, I think it would be an investment.

My current system:

CD: Musical Fidelity A3.2
Integr. amp. A3.2
Speakers: Dynaudio Audience 72
X-Can V3 with Sennheiser HD650
Rega P3 with Grado Platinum

I have done all the tweaking possible with cables, dedicated power line, etc, etc.
Actually nothing wrong with this system, I think it is well balanced, and is giving me some pleasure, with "some" CD's.
Classical & Jazz are mostly fine, rock is 90% unbearable, but this is probably due to the way it was recorded. right/wrong?

I was thinking of upgrading to one of those (probably in my order of preference...):

Musical Fidelity A5.5
Esoteric SA-10
Ayre CX-7e
Marantz SA11-S2
I also fiddled with the idea of a separate DAC but I'm not too hot on that (extra cables, etc.)

Does that make sense, or would I waste my money?
Eventually, the Amp. would be the next upgrade, but not yet.
What do you guys think?