I would try the substrate and or tub switch if you haven't ...sometimes I forget to try that and it can be magic. Best of luck on your efforts.