Spot on Charlie as usual mate. Do check the pump first though even if it is a Ford one. My new one didn't have all the holes drilled into it and confused the hell out of me once it was fitted... I wish I'd checked over it first.

You might also wish to consider a capilliary type temp gauge Bullseye. These can be wired into the thermo housing (needs drilling and tapping though) or into the side of the block where a blanking nut normally sits next to the water jacket. You'll see my old one sticking out of the block to the left of the tissue that is sticking out of the oil breather return (bottom left).