Accuphase all the way. As an owner I can tell you that it'll pair nicely with just about any speaker you throw at it. Gorgeous build quality to go along with superb sound.
My close buddy owns the SA20 in his secondary system and a Primaluna Dialogue HP is his main. I've spent many hours listening to both. We have owned the same speakers and our rooms are similar in size. The Primaluna outshines the SA20 in just about every way, most noticeable the soundstaging and more natural tonality.
Primaluna would be an upgrade for you, but long term Accuphase would be the way to go IMO.
Keep us posted if you make a purchase.