If 2-channel is important to you I think an integrated amp with a HT bypass is an optimal solution. Neither the preamp nor amp sections from your AVR are doing you any favors, so an integrated elegantly solves both issues in one box. I'd recommend a Hegel H160 as it has a HT bypass, is a big improvement for stereo over your Marantz and has the juice to power your B&Ws, and there are a few available now for around $1500, which is less than half of retail.
It sounds like there could be a settings issue possibly affecting your stereo performance. Regardless, the H160 will bring your 2-channel performance to an entirely different level while still allowing you to use the Marantz for sourround processing and amplifying the rear channels. BTW, with this setup the Marantz is completely out of the playback chain for stereo listening, and you can switch between stereo and surround with the push of one button -- in case you're not familiar with the HT bypass function. Anyway, hope this helps and best of luck.
It sounds like there could be a settings issue possibly affecting your stereo performance. Regardless, the H160 will bring your 2-channel performance to an entirely different level while still allowing you to use the Marantz for sourround processing and amplifying the rear channels. BTW, with this setup the Marantz is completely out of the playback chain for stereo listening, and you can switch between stereo and surround with the push of one button -- in case you're not familiar with the HT bypass function. Anyway, hope this helps and best of luck.