New Onkyo or Older Yamaha?

My room was recently a victim of a nasty power surge, but out of the ashes came an excuse to replace some very old equipment.

One thing that survived was my Yamaha RAV326 receiver that I bought on clearance. I've never liked it all that much. I primarily listen to music, but I also watch a lot of movies, an the Yamaha doesn't have HDMI, which restricts my PS3 to optical (not that it sounds bad). It also has problems with the menus and auto set-up, but I'm willing to get those serviced if need be.

However, while researching, I've become very fond of the Onkyo TX-SR805 receiver. I've read the manual cover to cover, and it's definitely got everything I want in a receiver. I've found it advertised online for roughly $600.

My problem is, I'm not familiar enough with Onkyo and Yamaha to know how good their sound quality is, which is my main priority. The Onkyo would be new, not to mention only 2 steps below their flagship receiver, but I don't know how that relates the quality of the Yamaha, whom I've heard is a better receiver just by the name.

So, should I give up HDMI audio (which I could do) and service the Yamaha, or would it be worth my while to get the Onkyo? If you have any other suggestions in that price range, or any other solutions, I'd love to hear them.