I have a suggestion for you getting the CHP headlights, just put something in the classifieds for wanting a set. With so many people selling, wrecking or changing there cars all the time it shouldn't be a problem getting a pair. I had them but when I got the Aussie grills I had to trade for a pair of OEM ones, see what I mean
Oh and by the way, a black Tour with the black CHP headlights AND grill ring dipped in muratic acid and painted black looks AWESOME