I feel your pain. Two-bath fixing solves this. First bath is the old stuff. Second bath is always fresh fixer mixed up for the session. Pour the second bath into the bottle first then as much of the first bath as still fits. Recycle the rest. Only need one bottle since you make the second bath fresh every time.

... Twice today I flick off the light switch thinking it will turn off the water. ...