One of the sets of fixtures controlled by the switches is below 25W, the other is well above.
It looks like I have the rare case of non-neutral that will work with a dumb switch as mentioned in passing by Eric here.
So my understanding is re-wiring to the below setup should work, but the <25W branch may need a bypass or I replace the fixture with incandescent bulbs.
