Baldwin has a very comprehensive line, as does WIX.
Getting water out of the oil is tough. A complete coalescer unit is the right way to do it, and for a small system just dumping the oil is cheaper. Settling is one way. I've tried using a Racor diesel fuel filter with warm oil, very slow feed rate, and either the normal 10 micron elements or the winter 25 micron elements. If everything was just right, especially very warm oil, it did fair.
Good hydraulic oil is made for the water to settle out. If you're using ATF, that's made to emulsify water. Dump it.
Ken