I don't know that any of them will "remove" the water. It's still going to convert to steam in the injector which is the problem, along with possible hydraulic lock.
Unfortunately, you're best bet is going to be to drain that pia HFCM...
I get the water in fuel light from time to time but draining the filter housing doesn't seem to help. I always have to have the housing taken apart and cleaned. It seems to have this substance that looks like partially dissolved dookie stuck inside the housing, is that bacteria or just trash and water?