Watershed plan heads back to council