The head light ended up being the same as that of a new KLR, also Ninja 250 and Z1000. Probably 20 bikes using the same headlight, but not all models in SA. The main difference and also the reason for numbers not being the same turns out to be little things like a little sponge stuck onto the one and not the other one. Some also has an extra pointy bit which is most often removed on the others.
I got one from DocKLR.