I was faced with a similar problem a while ago, and ended up getting a denon S930H. I love it, and think i made the right decision. I do wish i had gone with the higher end unit (for a bit more) for the higher quality audacity.
I cant speak much about yamaha, but personally would stay away from wireless audio. I've seen too many horror stories about the speakers dropping out, often because of something stupid like WiFi interfering.