I did the same, almost went to run to #20 after visiting the pivot control the first time.
I was also too far south on #16 after being clueless for much of the leg on the way there. Should have sat on the track then dropped into the gully past #8/19. I did end up in the gully eventually then went too far off the watercourse.
If we didn't cross paths it might have been worse to control 9, I was thinking where did you come from, then went holy shit im not heading the right direction, massive right turn then back on track. Just didn't put my head back on the map after the water stop.
So were you heading off to #18?
I was heading to control 9, the long way.