I had tried many solid amps with B&W (802,802 and 800) , like Krell, MC, MarkLevinson, PassLab, GoldMund, Gryphon...So, Goldmund and Gryphon (and FM Acoustic) are very expensive, which I don't want to count on here. I think McIntosh-B&W combo makes better sound than Krell-B&W. Once I compare Krell FPB 600 and MC 1000 on B&W 801 and found MC 1000 gave sweeter sound (especially in mid-band) while FPB 600 make the LF like from a strong canon. The same thing when I used both KSA 200S and MC 2600 with B&W. But when I tried with Dynaudio, Krell made better job (actually Mark Levinson is the best with ML 20.6).
But overall, your setup is really good. Idon't know much about your other equipment like cable, room size... for saying McIntosh can make better sound or not.