I'd go with an AV amp, arguably the most bang for the buck and definitely the more flexible option. Several brands including Yamaha refresh their models on a yearly basis, often with smallish tweaks, and tend to price dump remaining stock on previous models. Look at Yamaha RX-V775 for example (current model is V777 I believe), or Marantz SR7008 which has recently been reduced so may be on its way out shortly.
The Yam delivers 95W at 2 channels and 8 ohms, 2 optical + 2 coax digital in, 5 analog inputs. And if you later fancy, a flexible subwoofer out (2 in fact) and of course multichannel capabilities. Hard to beat really - I think the days of the dedicated "HiFi" 2 channel amps are pretty much over for most purposes.