No TC swap. I bought this ZJ about 6 months ago and it did this off and on and has gotten worse. I looked into replacing the switch but in the end decided this was easier and cheaper. I test drove another ZJ before I bought this that had the same issue so I thought it might be a common problem.
You could do this when you swap from a 249 to a 231 however.