If you verified that you got water mixed in with the oil, i would suggest during the oil change, pour at least 4 quarts of oil in the oil filler hole as quick as possible to flood out the cylinder head and push the water thats trapped in the nooks and crannys and work it's way down to the oil pan and out the drain hole. I would also suggest that you check the transmission, t-case and both axles for water contamination. If you have access to an air compressor, install a blow gun at the tip of the hose and run it on all the electrical connectors, spark plug galleys, alternator or where ever you think got submerged and induced water.