Hey all I really need your help on this one,

My 2004 Grand Prix GT was making this odd wooshing noise which sounded like pouring/churning water behind my dash. I figured it was another water problem because I have had them in the past (in my floor boards, ceiling from the sunroof...etc). After a couple weeks, I took the car in not expecting much and this mechanic tells me that is it actually a blown gasket and my heads are pushing oil into my coolant. He also said he was surprised my car was even running, when it was running completely fine with no temperature problems or anything just the weird noise. SO I have him pop the top and do new gaskets, send the heads to a machine shop, flush my coolant and replace my oil. Prior to taking my car in my engine did seem warmer than usual this one time after a 100 mile drive but after adding coolant (which was bone dry) it was fine, and my "oil level low" sign kept appearing. So after the mechanic completes the job he says its running great and I go pick it up. He installed new coils and wires (MSDs) because mine looked like they "needed to be replaced" which was odd because I had them replace not even a year ago... Anyway, I get the car home and it seems fine. When I go to park it I noticed the noise again and so I popped it in neutral and gave it a little rev and sure enough the noise was back and just as bad if not worse. Also I noticed when driving my gear change from 2nd to 3rd seemed later than it usually is. I took the car for a half hour ride while closely observing to try and notice anything but I came up with nothing except that damn noise.

Please give me your advice and I'm sorry for being so wordy but I just wanted to give as much detail as possible.

Thanks!