PAINEWEBBER/GEODYNE INSTITUTIONAL/PENSION ENERGY INCOME P-2 LIMITED PARTNERSHIP AMENDED AND RESTATED AGREEMENT OF LIMITED PARTNERSHIP