almost hydrolocked, but didnt. EEEK!!!!

so i saw a decent sized puddle (maybe 4 inches deep) but i had to go through it, people would have ran into me from behind, so i went through it in neutral, then after, my car revved up to about 3k and then died. i then cranked it, and had to give it some gas to start, but it did start, and i got to a more dry land, and kept revving it, and a crapload of smoke came out the exhaust, and ever since then, my car's been idling like crazy, it fluctuates between 1k and 2k. (ex. vroooom, vrooooom, vroooooom.... lol).

the codes i pulled are
P0507 idle control system - rpm high
P2279 intake air system leak

i've already
-changed my oil, the oil came out smooth, no muddy oil whatsoever.
-checked the idle air control valve, it was clean, only a little black residue in there, which i cleaned out already
-let everything dry overnight, took off the cold air intake and everything
-reset ecu

any other ideas? thanks for your help.