I assume you want the switch to force the output on, regardless of the output state of the WC.
That is an "OR" function, rather then messing with diodes why not just use a two input OR gate
or depending on logic levels a NOR? A 14 pin package gives you 4 gates, enough for 4 outputs.
For several...