I ended up working out the thread pitch and diameter, then went to a Metric bolt specialist and found a suitable bolt. It was a matter of machining the bolt to suit (bore centre/cross drill), plus I also had to bore out the end of the water line to suit the bolt. Obviously unless you have access to the equipment, probably easier to get the bolts from a wrecker...the ones I tried either didn't have them or didn't want to sell.
I didn't use any new gaskets as the old ones looked fine, but I used new copper washers on the oil and water lines.