Andy,
Not wanting to come over as smug, but, when you first listed the thread about stripping the bike I said the following ...
Clearly identify the Neutral switch connector on the loom, looks just like another one (rear brake I think) and you can mix them up. OK, should have said the neutral switch connector and oil pressure connector ... but you get the idea.
Only reason I know is because I got them back to front as well