FWIW, I owned the XP-20 for less than 6 months. Sold it because it was lifeless, for lack of a better term. Are you adverse to running a tubed preamp into your Maker? I have had incredible results running a tubed pre and SS amp.
Currently using a Audio Experience A2 Gold fully balanced tube pre into a Pass X-350.5. With Pass Labs the amps are awesome, the preamps not so much. IMO but have heard of others that mirror my experience.