UPDATE
Thanks for all the advice and interesting ideas!
To answer a few questions - the water comes via a spring into the property then direct to the cold water taps (through a fibre cartridge filter first), there is a tank in the loft but only to feed the hot water cylinder.
The boiler is...