When you're 99% sure, theres always the 1% chance you're wrong :-)
So, replaced the pump and the banging has stopped and the everything seemed fine. This was until the temparature of the cylinder started getting upto temperature, and the new pump has started to make a hissing noise, which...