I am sorry, I was lazy to read the entire thread but with 4 wires going to each switch box you can simply rewire everything and use smart switch in any location plus companion switch in the other. And I sorry again, I am lazy to create a drawing.
Download the Hubitat app
