I was going to suggest getting a set up B&W DM602 S3s, but between them and a sub, that is out of your budget. I think B&W matches up with Yamaha extremely extremely well. As good as the old fabled B&W and Rotel does. DM602s would run you about 500, not leaving much towards a sub though...