Little known fact, and this is based on a knowledge gained a few years ago, is that Denon offers a upgrade program. You send them your old receivers, pay a fraction of the cost of the new one, and they send you a new receiver.
I am not sure of other audio receiver makers, and am unsure of Denons current commitment to this program. I do know that Cannon has a program like this for their high end cammeras.
Maybe you should look into this for your Yamaha.