Upgrade to Macintosh MA7000 or Luxman L507u?

Now using Musical Fidelity A5 paired with Vandersteen 2ce Signatures. A5 a little bright to me, plus would like headphone amp and tone control which A5 lack. Aware Vandys have tone controls but generally don't tweak them too often. My looking led me to McIntosh and Luxman. Given that I really don't think the speakers are the problem, what are people's comments on these two integrated's? (Budget is around 8k. I love Brahms, Beethoven, Radiohead, Miles Davis, REM.)