Nissan Sentra Idle issues

On my way home from work on Friday my check engine light came on at a stop light, prior to this I had noticed that upon pulling off of the freeway that the RPM's hung at about 1500 for about 1 minute. I took the car to pepboys where I had the code read and cleared. The code that was read was P0507 that reads, "Idle speed control system RPM higher than expected" I called my uncle who is a mechanic and he advised me to buy some throttle body cleaner and clean it out because he said theres probably build up thats holding the butterfly valve open. I purchased regular throttle body cleaner took apart the intake, disconnecting only the MAF (Mass Airflow sensor) to get to the TB. I opened the butterfly valve with my fingers while I sprayed the cleaner wiping away any overspray as the instructions on the can said. After cleaning it up I reassembled the intake making sure everything was tight so there were no leaks. Once I started the car, the idle began to occilate from 1500 to 2500 rpm. I tried the Idle Air Volume Learning and the Throttle Valve Closed Position Learning and so far the idle hasn't changed. I've already ordered a new throttle body, but I downloaded and read the Factory Service manual which states that the "Diagnostic Procedure" is to check PCV connection, check for air leaks after the MAF, and to replace the ECU. Does anyone have any advice for me or anything I should be aware of regarding this fix? The vehicle is a 2006 Nissan Sentra SE-R Spec V with the 2.5 QR25 Engine