Gregg,
Either swap it or have it repaired correctly, the problem with the swap is that the next Cab2 might act the very same way or have a different problem. I plan to send mine in for repair after the Christmas layout comes down. Wish GGG or Guns or willygee (Bill Igraham) were warranty legal, to fix this stuff however. The OGR guys do great work correctly the 1st time.
PCRR/Dave