OP, I suspect you are on the correct path upgrading the DAC....especially if the Eversolo DAC sounds better than the MAC unit. There are some very good DACs you can get for around $2,000. If I were looking in that range I'd look at: Denafrips Pontus 15th at $2,000....NOT the Pontus 12th or earlier. Benchmark DAC3 $1,900, Border Patrol DAC SE $1,400, Schitt Yggdrasil $2,300.
I'm a huge Denafrips fan and owner (as are many others), but you'll find support for all of the above options