I should have changed the water pump elbow orientation before I mounted the engine. CM and JP both mentioned changing the elbows position before mounting the engine on their blogs, which I had read. ( Yep, I forgot ). It was a much easier job to change the orientation of the elbow than I expected. I used a 5mm hex drive to remove the two 6mm hex screws, then re-torqued them to 10 Nm ( 90 in.lb ) after re-positioning the elbow.