Lubing the throttle linkage worked for a while but the high idle problem I was experiencing came back. So I cleaned the crank angle sensor and that helped for a while. However, I had put off changing the oil and went to the 13k miles mark since the last change (usually I do it every 10k) so I changed the oil and cleaned the crank angle sensor again. I think that is going to do the trick, the bike idles better than ever and returns to idle faster than it used to. Putting the crank angle sensor back into a bath of old, metal laden, oil, defeated the purpose of cleaning the sensor in the first place.
I think I will start changing the oil at 5k intervals instead of 10k and clean the crank angle sensor at every oil change.