Job done. Was a breeze. No more boiling over, idles around 100c which seems a little warm. I am guessing it will do better with some air flow on the road, tires and plates tomorrow.

Also found the grinding noise. Unused RPM sensor bracket with missing bolt. Removed and sounds great now. Water pump was probably fine all along, but followed through with it while it was apart.