I think I understand your point. When it might be misunderstood as a sort of conditional, you'd prefer to use "when." I agree.
If there's no ambiguity, then either may be used. We're really talking about habitual behavior, right? When / if I'm late for class, I don't bother to shave. If I have to jump out of that plane, I think I'll be sick. ("When" wo