you might be right on that headlamp bolt brian - a now half recall it was bsf, so dont trust my memory (i don't).
while you are at it, and for more unsolicited advice, if you have an old dodgy switch and a new high current headlamp then 2 other fairly easy upgrades are a relay to offload the current from the tired old hi-lo beam switch and a separate thick earth wire going directly from the headlamp ground to where the battery ground attaches to the frame. the earthing can be random on these bikes and impaired by things like grease i the head bearings etc.
your bike is now 12v not 6v, so those little losses are less significant on final voltage tho still worth avoiding. and besides, if you get all this work finished too soon you'll have to go and ride it and that's dangerous!