The junk is already removed thanks to the PO.
I will check out the baja designs stuff. Most of the headlight replacement units come with a "not DOT approved" warning and my experience is that many of them really suck.
I'll keep hunting for the plastics. Right now I have them rattle-canned earth brown, but I am hoping to make it a bit more "sporty" looking. I can remove the paint, but I'm still left with a beat-up from fender and such. We'll see what I can find.
Any more help, feel free to post up!