I thought for reliability you avoided the AirDog stuff LOL
the OEM should be drained more frequently than the filter change interval IMHO and if you had two much water from a bad fill up it should have set the WIF light? and the new filter design is supposed to not bypass when clogged like the previous
I personally would do a racor separator filter if I were worried about water and the ability of the OEM ..
but that wouldn't give you the air separation benefit that is My 2 cents
6.0L and 6.4L diesel engine fuel filters are up to 98% efficient at four microns or larger
Water removal efficiency is 96% or better( not including the water separation of the housing itself I would bet )
Aquabloc technology in 6.0L and 6.4L diesel engine fuel filters ensures separation of water from fuel
Recommended by Ford Motor Company