One other thing on the water pump. On a new pump, the fan should pilot on the shaft diameter. The original Tiger fan piloted on a larger pilot machined in the flange. If the fan you are going to use has a larger hole than the pump shaft you will need to machine a thin spacer that presses on the shaft to act as a pilot.
John Logan