"Context switching should be within the boundaries of a story. "

That is a good point, one I didn't know I was making while writing but one I agree upon having made, now that you mention it ;)