Thank you Tintin!

And thanks to everyone else for their comments to date. I will look at room treatment in the longer term. I do expect to make significant changes to the floor, walls, ceiling and chimney breast in 12 months time and I would expect this to have an effect on things.

Sooloos sounds like a nice option with a clear upgrade path. It does mean that I won't have the same convenience of control that I have with the Squeezebox. i.e. Touchscreen, Apple, Android and PC. I really like the idea of a dedicated screen but not in the shape of the C15. We are mainly an Android house.

Not many people have been suggesting the HD621 and I have had feedback from some that the sound improvements are quite minor for music although better for films.

My mind is telling me that the sub woofer is not the way to go but I'm not discounting it completely...

And yes .... I do want kit and not room treatment both from a practical and superfluous point of view!

Thanks
Tom

Main: G61SL, 218, HD621, 2*7200SE, 7200HCSE, M6s, DSW, Apple TV 4K, NUC (Roon server)
Secondary: Wiim Pro, 3200, Audio Core 200
F80