Normally I would go with what Slv said, but in this case I would go with your first thought of a cdp upgrade. Power conditioning is pricey, but well worth it. I would think power conditioning will lead you, anyway, toward a new source. I'm an Audio Aero Prima fan. You'll get oodles of suggestions: Put the Prima on your very short list. Your source, especially, deserves, its' own dedicated line. That, before power conditioning.....peace, warren