Don't overlook the oil pump,I would replace it with a good Melling and clean the pick up real good.Check the pan for rust,if in doubt,replace it.They are known for rusting out.You don't want to have to pull it again down the road,for a pump or pan leaking.You may even find evidence in the pick up,or the pump may even be at fault.It's just good insurance.Clean and check that crank real good,you don't want to waste the whole job.