C W Moss would be a source for what you are looking for. The sell a repair kit that have really great "blind" stainless steel bolts. These replace the rivits that hold the headlite mount to the shell. They also sell lense, lense cork, lense clips, reflectors, etc.
have fun.