You have a similar setup to mine! I have The edition XS and have the same amazon cable(miles better than stock). I was using an Ifi zen air dac and a ifi xcan. I actually upgraded to the SMSL SH-9, I think its a great amplifier has plenty of power and the screen and remote are underrated. I woudn't upgrade unless you feel like you need more power. I did exchange the DAC and now I'm using an Aiyima T10 tube dac with upgraded tubes and its been a noteworthy upgrade. Theres next to zero reviews on the unit but Tube goodness+a solid state amp with power and planar headphones are a heavenly combo.