Thanks, appreciate the input! I will try both ideas!
I am also going to see if I can replace the entire headlight basket assembly's with newer rings.. Meantime, I had to silicone two of the glass headlamps in place, as there was only one screw tab left on each..! Sigh... is it going to get any Funner than this?! Ha!