Think Im going remove the engine and change the pump. The fact it runs without any worrying noises gives me comfort.
What parts will I need?
Oil Pump (of course !) - but you maybe wise to wait until it's out to see what drive you have on the Cam unless you are sure of what's in there. I find the stock steel backed pumps excellent.
Gasket to suit
Flywheel Housing Gasket
That's really about it.
You will need to remove the Flywheel, so you'll need a puller and while it's off, it's an opportunity to check the clutch.
This ^
Also the primary gear oil seal and maybe check the clearance on the primary gear.
+1 for standard oil pumps unless you intend to strip it all down and build a super hot motor.