EX-10(r) AMENDED AND RESTATED LIMITED PARTNERSHIP AGREEMENT by and between MISSION ENERGY NEW YORK, INC. a California corporation ("MENY")