Don't Throw Out The Yamaha!
Please don't throw the Yamaha away, you could always sell it. You won't get much, but at least it will get you ahead to buy a new receiver like the Yamaha RX-V659. I think it would perform very well for your needs, and it is a really good deal.
Zumbo found the Yamaha HTR-5990 somewhere and it is loaded with features, it can be had for around $500 if you look in the right places. Zumbo probably has the link bookmarked.