I would never fly "upwind" on downwind but would adjust my heading and speed on the crosswind leg to ensure I'd arrive behind the other traffic. If this is not possible, or dangerous due to additional traffic I may bug out and turn back into the dead side. (but in this case I probably wasn't paying proper attention)...