Keep the Yamaha for cinema and buy a good stereo integrated - I doubt very much you'll be imppressed by home theatre att the price you want to pay, playing music.

A good wee integrated stereo amp will do wonders however.