Thanks to Auxinput and Randy 11input for your input. I decided to go with a Marantz 5007 and I'm excited with the musicality. Much warmer sound and the highs aren't quite as harsh as before, and the mids are cathartic. Next I'm looking to replace my Yamaha speakers with something a little better. Possibly Polk Audio TSi series or Paradigm, mostly due to a limited budget, I love Focals but just can't stretch that far. Baby steps gentlemen. Thoughts?