For the two contracts that you've mentioned, I'd say definitely 8". Looking at photos again though, it seems that the early part of C5108 might well have had the smaller lamps too. This was also a late 1939 contract.

It seems that by 1940 they had standardised on the larger headlamp.