Planning new system(s!)

[aberdeeneuan]

We have been using my old Pioneer 5.1 surround sound system for years (it's about 7 years old now!) and while it still sounds awesome for films, it sounds rubbish for music. We listen to music more than watch films these days, so I'm re-evaluating my system in readyness for a new purchase early in the new year and would like some advice.

I'm going to be fitting a NAS and either Sonos or Squeezebox units for music in the kitchen, dining room and an input into the lounge. The kitchen I'm looking at either a Squuezebox Radio or the new Pure Sensia (once the firmware is sorted!), the dining room will be either a Squeezebox Boom or a Duet, or a Sonos and some speakers. My issue is the lounge. The TV is in the corner beside the chimney so "proper" 5.1 is difficult to get. But my focus has changed from movies to music and I want to finally get some decent stereo sounds in there, with with bit of something extra for films. I don't want to have two systems and don't want 5.1. So, I'm thinking of either:

1 - Getting decent bookshelf speakers, amp and an input (Sonos or Duet) for music, and play films through that.
2 - Getting not so good kit for stereo and fit a Yamaha soundbar (and possibly a sub) which i'd only use for films
3 - Getting a decent AV amp that supports decent stereo and put all my eggs in that basket

I'm not worried about HD audio, but don't have the space for a ton of kit and speakers - my 17 week old son has taken over the lounge...

What are the thoughts?

[Lastinclass]

If you are where your username suggests go and see Trevor at Booths in Inverurie. The bloke at Sevenoaks sound and vision in Crown street is helpful too.

[aberdeeneuan]

Unfortunately not, I'm from Aberdeen but live in the West Midlands now!

[Lastinclass]

There must be a sevenoaks near you? Not sure but is there not a company Evesham way that has a good reputation?
Get hold of Plotloss on here, he's a knowledgable lad.