Yamaha to me among your components are not the weakest link. I would start with speakers.
For the assumed targetting budget, I'd look for nice vintage speakers such as McIntosh, Tannoy or Spendor within $2...300. There are may b plenty in your local craigslist adds. You can visit sellers personally with your receiver and test them in synergy at recommended listening position. Necessary upkeeping of vintage speakers shouldn't be expensive, but would advise to research first once you find ones you like.
Good luck.
For the assumed targetting budget, I'd look for nice vintage speakers such as McIntosh, Tannoy or Spendor within $2...300. There are may b plenty in your local craigslist adds. You can visit sellers personally with your receiver and test them in synergy at recommended listening position. Necessary upkeeping of vintage speakers shouldn't be expensive, but would advise to research first once you find ones you like.
Good luck.