I have not owned a Hegel but was researching SS preamps recently. McCormack fell onto my list, but I have not seen one used so have not pulled the trigger. Other preamps which gained my attention were Herron, Belles, Atoll, Ayre, and Van Alstine's Vision.
If I had both a McCormack preamp and an amp, I would be wondering if there was a good synergy between them I'd be messing up by switching to a new preamp. Perhaps you just want a change? If so, maybe consider a tube preamp? Just thinking aloud with you.