If your main priority of listening is more MUSIC than HT, than I would not be considering either one of those Yamaha receivers, and would look toward Marantz. Please read up about them, especially the receivers that have these series model numbers:
4001,5001,6001,7001,8001 (2006 models)
4002,5002,6002,7002,8002 (2007 models)
Many of the models above are still being sold at accessories4less. They are more affordable there than of any other place I've seen online and far more trustworthy than fleabay. Marantz's has also just introduced an even newer line up with the 4003 & 5003 models as well.