Maybe this is too late but you should try Volumetric fog.
You will find it in the fog’s Details panel. Check it and the fog will respect the lighting and exist only according to the lighting in the scene. That means, if you have a closed space, it will not have any fog. Iam guessing it will work well for the water too.