While I understand your affinity for your Mac preamp, I wonder if you have tried an ARC preamp IN YOUR ROOM. It may not be for you, but if you have not tried one, I would give it a shot. Try the newer ones or the older ones--be sure you stick to the tube versions.
Whatever you decide, enjoy the music!
Cheers!