Finally got all the auxilliary crap out of the engine compartment (engine refer, water heater) removed oil line, cleaned up a lot of sprayed engine oil, and refitted new oil lines (this time with brass couplings to match the brass couplings on the new oil cooler), new alternator mount and bracket. Oil change, coolant change, clean engine room, and away we go. The auxilliary equipment even prevented access to the raw water through-hull --- very bad idea. The lesson to me is not to be carried away with providing all the amenities of home, like hot running water, at the risk of sinking the vessel because critical components become inaccessible. Once again, KISS.