Hey Jim,
Your rewiring sounds much simpler than my idea, I’ll do that in the AM.
The pump is definitely running after 7 pm, at high speed, although now when I look the panel is saying “jets” are on too. I likely need to resort the circuits. I’ve attached images of the panel and swcg...