Hi Tony, that's correct..... pipe B is the return from the calorifier (and exactly as you say) T's into the water pump below and the heat exchange above.
Last week I identified a leak in the raw water system (very inaccessable right under the engine) lt looks like it could be a compression fitting on a 24mm copper pipe... This I Shall look into fixing first...
The calorifier producing hot water is further down on the list but it would be nice to have it working at some stage.
Thanks again Tony, can I make a donation to your cold beverage fund some how? Bank transfer perhaps?