sounds like you hydro locked the motor as a CAI w/o bypass valve will suck water into the cylinders. that probably why your still having idleing problems the timing belt might have even jumped because of it. but if you did get it to run right you might still have problems with down the line .