So, Firaxis tried fixing these issues themselves. Keyword is "tried"... The Sawmill now actually includes Camps, so far so good. Grocer and Ironworks are partially fixed, but apparently they stopped halfway through, fixing Mines and Woodcutters but not Clay Pits for the Ironworks and the Grocer still double dips into Farms and doesn't boost water tiles with features properly.
As a result, this mod still has its use and has been updated. The update wasn't strictly necessary, as I predicted the strings an official fix would eventually use correctly, but this way people know the mod is up to date and all.
