well, if it's what it sounds like.. (i had an idle problem.. everyone i talked to called it motor boating.. and i found some write ups for it) it could be the fast idle thermo valve...

idk.. just a guess.