I should add, current speakers are Klipsch RF82 and my amp is Denon PMA 2000RIV integrated.Listening tastes are electric blues and classic rock with a smattering of jazz.
You might be able to just buy a DAC and use the Yamaha if it has digital output. That will take you farther soundwise within your price range and provide options to run a music server off of a computer with it as well. With a computer based music server, you may find no need for the Yamaha as well.
I'd recommend a used mhdt Constantine DAC with USB connectivity or similar mhdt Paradisea tube DAC, depending on your taste.
NAD C515BEE $299.00 new,free shipping from several online sources.I used one while searching for a higher end product and it sounded just fine the few months I owned it.Rave reviews in all the mags if that means anything to you.I'm setting up a small system in my bedroom now and I sure wish I would have kept mine,oh well,live and learn.Good luck in your search.