If it has done those ks then i would assume the oil pump bolt is fine.
Good clean oil is an engines best friend. So number one is dont skimp on oil.
Regarding the power steering pump noise. It will go and is not a fun job. Not hard but messy. Dont steer full lock if you can possibly avoid it and you will get a bit more time.

