I've just been making calls to the dealer. I'm not done yet, since they've passed me around. Next call is to the service manager.
If they can fix it for cheap, I'll do that. if not, I'll send them out a letter.