@Gearjunky nice stuff man! Hey, only because you said speakers were your weak point, then mentioned Heresy’s. You should pick those up, google “Super Heresy”. There’s a thread you’ll find, from another forum. Sorry With some easy,, and relatively cost effective, mods that take the Heresy to the next level. Some of the nicest speakers I’ve heard. Just an idea, I bet your system sounds great as is. Just an idea, as the Super Heresy, or any Klipsch Heritage sound GREAT with Mac power feeding them.