sorry to say, neither will sound good for music. it's a sad fact that a/v receivers in that price range produce flat, lifeless music that is nearly impossible to listen to. the yamaha has pre-amp outs, so that is it's saving grace for music if you have something decent to pre-amp it out to.
before either of those, though, you should consider NAD, harman, and even denon. and if you don't think you need 5.1/7.1, definitely consider a 2.1 audio receiver over an a/v, or just a good amp (e.g., NAD C320BEE) to run your CD player, and get surround separates later. music reproduction will be much better that way than with either of the a/v HT receivers you mentioned.