nice setup. i also have a pair of mani 2's with classe and odyssey components. I have been thinking about going to a more powerful amp for the mani's, like a classe ca-301 or mcintosh mc352. as for a cdp, check out the esoteric or the musical fidelity sacd player ($6000+). Don't go cheap on your source components.
good luck
good luck