Dave, if you pull in the clutch, does the idle drop? I had this same problem with mine. The neutral switch would fail when engine warmed up and would not recognize the bike was in neutral so idle would soar between 1300-2000. If I pulled in clutch idle would drop back to 1100 or so. I just bypassed the clutch switch
Mine is ECM controlled '08 model