Hi Aero,
Thankyou for the information re the number of teeth on the driven gear. I am pretty sure yours will be the correct size, as I now realise it should fit through the dynamo spigot hole in the outer case, which is 1 5/16" diameter.
I have today received the 25 tooth gear from HPC, and it is too big, so despite my best attempt at measurement of the shaft centres, 'taint right! I shall grovel to them tomorrow to see if I can exchange it for a 21 tooth, but some pictures and the dimensions from yours would be most welcome.
Cheers for now
Doug