The current rads are mostly 20+ years old and I intend to replace most of them - like for like soon. The total output of the new rads will be: Upstairs 6kw, downstairs 11kw, plus the existing emersion tank of say 3kw.
The boiler is a Vaillant 428, rated down to 21kw at present.