I started on Option B (including/excluding until it loops around) - I have decided this is a non-runner as I have about 90 cycles to do and they are taking an age.
I think it will have to be Option A (full reset).
I will update this thread with the result when I can schedule some time to do this.