The only time I've had high idle problems was when I had a slight kink in my throttle cable linkeage. Having it disappear when you kill power makes me think you might have a bad sensor. Or, a problem with the PP servo, you should watch what it does when the boats giving you grief and you are cycling the perko. The servomotor can lose a phase and do really goofy things. You can run the servo test from the pp manual to make sure it's fully functional.
There are some tests you can do with a multimeter in the engine manual for various sensors, throttle position motor, etc. and there's (at least for now!) the scan tool if you need it.