Some good digging there! Is that missing the OE overseas entity type though (also a “special case” of course)?
For bonus perhaps a mapping of the “Enum constants” for the company type with the company numbers (IIRC there are some which you can’t just assign based on company number as the company type gives additional info e.g. public limited vs. private company and the various types of “limited” etc and the various types of ICVC e.g. “icvc-securities”, “icvc-warrant” etc).