yo!!! is COMP_OUT (bottom right) already fitted with the appropriate diode for the "analog OR gate" (top)? i'm not sure how it works because the D18 diode before COMP_OUT is also connected as feedback to the op-amp. does the altered wiring through the switch (bottom left) look plausible?