My nephew is a GM dealer diesel tech. He says disaster kit all the way! He said the last one he did in that scenario the pump was actually in 2 pieces and the gear was in the timing cover. Login to read more.