OK, I think I am getting this. I have simplified the state diagram and the program flow. My only concern is that with fewer states, the WATERING_STATE has gotten much bigger. Still, I think it is clear what is going on there. Please take a look. Feel like we are getting close.
The Repo: https://github.com/chipmc/AquaMasterFSM
Thanks,
Chip