Okay so can you please elaborate in what sequence did your problems occur? Something similar happened to me. Im guessing you had the second problem first and then when you got the throttle body cleaned the rpm started to surge, am I right?
I experienced similar sort of problems with my baleno and I assessed that the throttle body needed cleaning. However, my dad took the car to the mechanic and he fixed the problem by deattaching the cng leads behind the engine and the problem went away. 3 days back I wanted to clean the throttle body myself and I went ahead with it, just wanted to do it for some reason. Upon cleaning the throttle body I found a metal piece blocking the air pipe going to the throttle body (CNG purposes). The car was designed to work on cng although I've never used cng but the equipment is still there. So I got rid of those and my car response has become so much better and everything was fine besides the rpm which was idling at 900 rpm. Before cleaning it idled at 800 rpm so I become over efficient and sprayed the throttle body and IAC valve with carb cleaner again to make it idle at 800 and since then I have been getting rpm surges exactly like you mentioned. Rpm is jumping upto 2500 and idles 1000. I think this is how you problem has occur. Another thing ive noticed is that when i move the steering wheel the rpm jumps up a good 700 before coming back to 1000, I know it should fluctuate when the steering is moved but no this much, does this happen with your car? I have even tried Idle relearning and that didnt work.
For your first problem I'd suggest to get rid of the CNG wirings and other systems attached to your engine if you still have that in tact. Im a noob and have no real knowledge about the engine but in the time I have kept this car I have experienced problems similar to your and the culprit the CNG system. Maybe this would solve your problem.
And if you find a solution for your surging rpm please do let me know in this thread 
