So, I'm going to get a new amp.
My new room only has space for stereo, surround would be doable but can't be bothered.
Choices:
Marantz PM-14S1
Cambridge Audio Azur 851a
Icon Audio ST40
I've booked a demo for Azur 851a Monday just to get an idea of what the amp can do.
I'll follow it up with home demo's in a couple of weeks.