Time and effort wise, just buy new tail lights. About $230 or so for a pair on ebay, but they help make the GP look new again! I purchased new headlights and tail lights for mine.
Christ if you do that for stock, may as well get LEDs. 235 for the sexy smoked ones!