Since eliminating the unapproved cleaning chemicals regularly used by the shop and pumping out two tanks of the separator the system has normalized. There is now a clear separation between fuel/oil and water and the water is now mostly clear. Thanks to whomever reacted so quickly to the inspection in August that resulted in having our tanks pumped out. Everything seems to be in good shape now.