One thing you can check mate.....under the seat..near the tank, is a white connector for the fuel pump....on mine, the wires had got pinched at some point and bare wire was showing through
Luckily i saw it and put some insulating tape round it, just check yours as it could cause a problem should it touch the frame