We did the same water trick, about 1500 to 2000 rpm, a cup water in hand and start dumping it in. You need enough to choke it down a little and make steam, not enough to kill it, too little didn't seem to do anything. A few good hard pulls up a long hill cleans it out pretty good also. A little hotter thermostat wouldn't hurt.
