Diode OR or transistor OR circuit?
Can't get it right the debouncing circuit for circuit version 3 so I guess I'm going to use circuit version 2 (with diodes), it looks like working:   





EDIT:   

My filter is not working ok, simulation with 5ms pulses at 20ms, the capacitor doesn't discharge fast enough so the InputBySW voltage keeps rising with each pulse and eventually changing the output value:   



Now I'm trying to figure out how to make it work.   

EDIT 2:   

Came up with this solution that looks like working: