Oh yeah, I also think your current set-up is just fine and dandy. I would upgrade speakers and sub and leave everything else. The Yamaha you have now should power any new speakers with ease.