I doubt many people will have experience with both upgrades (all four products). But I feel very comfortable in the conventional wisdom that upgrading your source (CD player) is one of the best improvement you can make to your system.
Personally I'd be tempted to make a more radical change with your source - maybe moving into tubed technology. But that's just me.
Personally I'd be tempted to make a more radical change with your source - maybe moving into tubed technology. But that's just me.