Current setup is Yamaha BD-A1010 DVD player, Yamaha RX-A3010 Receiver and Monitor Audio Gold Refernce GS20 speakers including centre speaker ( no surrounds or sub woofer) and music on .wav format on iPod (lossless) played through USB on A3010 so users Receiver DAC. Want to upgrade speakers - would Monitor Audio PL200s or B&W 804 Diamonds be overkill with this setup. Cost is high so don't want to upgrade to speakers that are "too good" for the source kit. Any advice/opinion greatly appreciated.