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