Please feel free to start a new thread on the topic, but not here to avoid confusion of answers between the 2 situations.
Pictures are essential, I see you are familiar with doing that and it works well for us. We like to see the wiring of each switch and iff possible which wires come from each...