PC Audio 2.1 upgrade recommendations

Hi, This is my first time posting here on Audiogon, and just wanted to ask you the experts for a recommendation for my next upgrade. Here is my current desktop PC audio setup...

DAC - Schiit Modi
AMP - Topping TP40 (25x2)
SPEAKERS - Traid InRoom Mini HT (now called InRoom Bronze)
HEADPHONE AMP - Schiit Magi
SUB - JL Audio E-110
AudioQuest interconnects for every piece, including power cables.

What I would like is a more powerful, cleaner integrated amp, I get a lot of distortion with my current amp, because of the low power and high volume required at times. I definitely want something to fit on my desktop, so small size would be nice, but not necessary. Also pre-outs will be needed to drive my sub.

I was looking at the Emotiva Mini-x-a-100 as well as more robust separates that I can find used, like a Anthem AVM and a cheap Emotiva amp but I am not sure what would be great for my setup.

Thanks for your help!