Thanks Kev! I've been a lurker for a while....
Yep I had a look on search but couldn't find anything identical to my issue, did point me into looking at CPS & Coils. Just found this one through your link:
http://www.xt660.com/showthread.php?...ight=high+idle
Added Clutch, Sidestand & Neutral switch onto my list of things to check.