check the top throttle linkage arm is moving freely. i had same issue and it was down to that arm, was gummed up so not always returning enough to click the switch. remove top 13mm nut and it comes off, cleanit up grease then refit. take care when putting it back on, really easy to get spring caught in the plastic washers.
also had problem on my cabby, on that one it was down to a stiff throttle cable. took it off and sprayed a bit o silicone spray lube down it, sorted.