Just a small tip to anyone who is playing around rebuilding things... make sure everything is spotlessly clean! The following picture is what mess i found this evening inside an oil pump pickup pipe that 'looked' clean (from the outside and looking in the filter hole).
I knew this engine had suffered an oil starvation problem in the past though, so i was unwilling to put this back on without taking it apart first. I'm glad i did, as there was a mix of silicone and swarf inside the filter just waiting to be sucked into the brand new oil pump!