If the CAI filter was re-oiled after being cleaned, then it may have been over oiled, which can coat the MAF sensor and cause idle and performance problems. Suggest cleaning this sensor.
Also, clean the TB. It's probably real dirty if it's never been cleaned, which can also cause engine...