That Yamaha looks really good. If you are sure you will not want the extra channels and you dont care about network features like streaming your music library from your computer and using your phone as a remote, go with the Yamaha. The only other real consideration is the quality of the room correction. I really dont have the experience to speak on ypao vs audyssey multiEQ.
Also many of the network features are redundant anyways. I can stream from my network using my Onkyo, Sammy bluray, and vizio smart tv. Same goes for Pandora.