Can't say for sure on your bike, but the neutral light switch should be on the left side of the crankcase, as you sit on the bike, up and inside the gear leaver. It will have a single wire terminal pushed on to it.
Does yours also have a side stand cut out? As in, won't start in gear with the side stand down? Worth another look at that one....
Mick
