High RPM issue...

So i have an 01 3.4L 4x4 manual SR5 Tacoma and im having issues with my RPMs. Im sure theres a thread somewhere that has my answer but im new here so i cant find it lol. My idle is anywhere from 1100-2100. And when driving at higher speeds my rpms dont really go down when im in neutral. They either stay up around 2800 or sometimes even rev up even higher to 3000ish. They wont go down till i slow way down. And hitting the throttle doesnt help it. Recently had my throttle body cleaned and it seemed to get worse but my shop says it needs to be replaced. Idk if they meant the whole thing or a certain part. Any ideas of what exactly it could be or a good place to find decent prices for the parts ill need. Im not super auto savvy but i can do some stuff on my own and can also get help from my dad who has a bit of experiance working on vehicles.
Also the higher rpms at higher speeds isnt all the time. But certainly enough to be an issue. Any help or tips would be very much appreciated. Thank you.

 

Maybe bad idle air control valve (IAC) or leak in one the hoses going to it. The IAC costs a good $200 at discounted dealer pricing (http://www.villagetoyotaparts.com/p...TROLFOR-THLOTTLE-BODY/2029089/2227062050.html ) and surprisingly aftermarket ones on Rock Auto are not much cheaper. So it's a good idea to test it first per service manual before spending the money to replace it. Requires a multimeter and a piece of jumper wire or paper clip.