Finally got the navigation lights fixed. The surveyor said the lights weren’t affixed properly and that the lenses were dirty.
I was able to find a new lens for the port light from Go2Marine.com, and got a whole new assembly for the starboard side, since it was kind of glued on there. I also added LED bulbs, taking care that the brightness is sufficient for 3nm visibility. I’ll have to check her out at night and see how it looks.
Old lenses on the bottom, shots of the complete work on top.