As I said in another post, don't get hung up on the headlight issue - it's nothing directly to do your non-starting issue, only a symptom. The dip/main won't work via the handlebar dip switch and headlamp relay without the engine running and the ECU receiving a pulse from CPS. It's normal for the pass switch to operate main beam though as it's a direct feed.

Looking at what you're describing here, I'd be pointing a very suspicious finger at the fuel pump. If it's making a noise, even a lame one, then the bike wouldn't appear to be immobilised. By the sound of what you describe, it isn't working properly, seized perhaps, possibly from lack of use whilst the bike was out of action?

If you can get hold of a Yamaha diagnostic tool, then you can test it in situ. Otherwise, remove it and test, or substitute for a known good one. The actual pump unit isn't that expensive to buy off ebay, so maybe worth rebuilding it? Ignore OE parts as they only quote a part number for the whole pump, filter, sender and casing, and it is VERY expensive!

__________________