Hi, I see you decided to change preamps. Good decision! You've narrowed it down to the same two that I did. As you may remember from your CD player thread, I have the C2200 and I am very happy with the choice. I've heard the Calypso is warmer. Since I was mating it to the MC-402, (sounds more like tube than solid state), I decided to go with the synergy of McIntosh for both amp & preamp. If I remember right, you have a bright high end issue. You may find that the Calypso works best for you. Either way, I think you'll be very pleased. I'm not sure if you have access to the two but it would be worth your time to go and listen. A good high end shop should allow you to bring in your amp to determine how they match. Good luck on your decision. Bill