Are you sure the water isn't left over water that was in the head? I pulled my head off before and I thought the water was drained out of the motor. When I pulled the head slightly off there was still water in the head that went into the cylinders. Can up pull the plugs after it dies and see if there is water in the jugs?
I did have a head gasket that was a little "rough". I took it off and used red Permatex RTV on the rough spots and it seals nicely. It's not a great fix but works if you don't have time to wait for a head gasket. Just make sure you keep the RTV away from the metal part of the head gasket (remember it will sqeeze i there).
