Re-using oil pump and pick up

If your not against changing them then do so, you'll sleep better at night.