Hi Scott. Sorry to hear of your troubles.
At the moment I am in discussions with Yamaha about this very problem. It would be really helpful if you could have a look at and respond to my request for information in this thread:
http://www.xt660.com/showthread.php?t=23501