Hi mate, i can only sympathize with you, i know exactly what you've been feeling, i was getting the EFI light and also the DIAG 1 on my dash.... My RSV mille R is doing the exact same thing, today i replaced all spark plug's, checked every connection, checked load test on battery, put a new side stand sensor on, and she kicked up first time, sounded beautiful to hear that purr.
I went round the streets through the gears and no problem slow or mid speed, came back put full riding gear on, went out got 2 miles at a set of lights and she died and would not start again, this is the 3rd time in a week now, and my patience is running thin..
After 5 minutes she kicked up un-aided with throttle or choke, got me back home, and cut out a freaking gain. Ive been reading your posts and out of curiosity went to the bike dis-armed it, she wouldn't start again, tapped the alarm and tried again, she turned over and wanted to run, but wasn't quite there.
I have the DATA-TOOL as-well and was wondering if you could mail me the instructions to send this glitchy pile of poop into orbit??