I think what is sometimes labelled as 'wisdom' is one giant accumulation of 'DOH!'.
I happen to have made this same change to my system several years back, and that's the only reason it dimly wafted back through my consciousness to offer it as a potential solution.
Glad you are back in action,
Bob Bone