uberwaltz, sounds like you are done for now but when, or if you get the upgrade bug again be sure to check out the new Ayre EX-8. It has a great built-in DAC and headphone amp and seems to meet most of your initial criteria. I too own the AX-7e along with an Ayre Codex DAC and the EX-8 sounds much better in my system. The AX-7e is no slouch and in combination with the Codex sounds really good. YMMV of course but in my system it is a dramatic improvement. Good Luck!