If priority is 2 channel, I'd invest in a good stereo pre and use a decent AVR to handle the multichannel duties. And definitely upgrade the amp to a good stereo amp that compliments your stereo pre. Your speakers are too good for mediocre upstream components. Send the front L/R outputs from the AVR to extra inputs on the stereo pre, and yiu have the best of both worlds. Best of luck.
