I'm nearing the end of my warranty, so I'm going to try and take one more crack at this. My SA has been great so at least I know they're on my side.
As soon as I'm out of warranty, I'll probably start modding, so this is it. Maybe the Cobb will fix it.