Woohoo! All installed and operating 100%.

No more headlight coming on before the engine fires up - then it comes on automatically after releasing the starter button.
I couldn't mount the new relay right beside the existing headlight relay - no room on my bike (an EFI model) but I believe there's a lot more room under the tank on the non-efi models.
So I mounted it about 8" further back (where the AI pump used to be) so an extension of the blue/yellow wire (and also the return from plug 87) was therefore required - but all went well. I also ended up moving the external diode so that it jumped across the connections in the old relay - jumping from position 1 to 3 - which is the same circuit but it eliminated a join in the wire coming from the starter button.
Thanks to D'Ecosse for the concept and circuit.