That is a good question and it is certainly a major concern.
I would add that these contaminants are not within my direct range of experience, but I know a bit about the problem they pose.
Yes, integrated water management is always wise. In this case, the solution would be to have no PFAS entering the resources in the first place.
I use the term eternal contaminants since these contaminants undergo very little transformation, very slowly. Once they are in the hydrosystem, in the water cycle, they stay there. This is particularly the case in groundwater, where the residence time is very long. This is a problem, and it is one of the public's biggest concerns when contaminant levels are high.
I would say that this is a fairly recent phenomenon. I might like to just propose a slightly different approach. We have only recently discovered and analyzed these concentrations. In fact, whenever we look for a contaminant in groundwater, we find it. Studies have been done where pesticides, bacteriological problems and pharmaceutical products have been found in groundwater when they were not expected. Groundwater circulates very slowly, but it is not immune to contamination.
I think the solution is prevention: taking action upstream. Now, unfortunately, we will probably have to live with these contamination problems for several decades yet.