All finished! I bought a ‘Heron’ chainring but it didn’t quite fit with the chain guard so I’ve kept the one that was on before. The rims eventually came up ok, and the dynohub and light (with LED bulb) are working, along with new brake blocks that just about stop the bike!