Ed writes:

I'm also searching for someone who still sells lights that fit the
older niches.

See http://www.grainger.com/ and search for keyword "pool light" and then
select "lights, swimming pool" for a half dozen fixtures that might fit.

The old ones show up on eBay now and then.