Worth a try, the way you describe the symptoms, it really does sound like you have attached the primary microswitch to the to the DHW housing and vice-versa.
I just cant see how changing a couple of diaphragms gives this problem.
You confirm that when you open a hw tap the pin comes out...