Manifold & heat exchanger advice sought

[csmithers]

Hi Everyone,

I recently ran into a problem with my 1980 Westerbeke 30 hp diesel engine. I neglectfully did not replace my zinc in a while, and unfortunately the zinc corroded and broke off inside the heat exchanger. In addition, I have a bit of a coolant leak coming from the end cap of my heat exchanger. It's pretty bad, it's leaking even when the engine is not on.

So, I am seeking some advice from those that are more skilled than me with engines. To fix both problems I will have to take the exhaust manifold, heat exchanger, and mixing elbow off completely.

Does anyone have any tips? Beyond the obvious of removing the manifold bolts, changing the gasket, etc. Here are the things that I've thought of:
1) Use penetrating oil on the manifold bolts a few days and a few times in advance
2) Take the heat exchanger to a radiator shop to pressure test
3) Bleed the cooling system before running
4) Take before pictures of everything assembled
5) Label hoses

The full project steps I've written out here. Feel free to destroy it: http://bit.ly/11SvzsH