Finally got this completed a few days ago, so pleased it's done (although there's always a few minor things to add). Hadn't ridden one since 1987 so took it down to a place I used to ride my original one.
Lot of nostalgia about super thin tyres, woeful brakes and using toe clips/straps again...