Nice pics.
I also have a contact for NOS spotlights if anyone needs them. They are (or were) $50 each. The shafts are incorrect (length), but you can't beat NOS, especially at that price.
I've also bought from R. Read before and he has a ton of hard-to-find parts.