Turns out everything I thought I knew was wrong. I can switch to be a non-thesis student, with the only consequence being that I can't be a TA, which doesn't bother me since the only reason to switch from thesis to non-thesis would be to take the Infineon job. Basically, I just have to stay continuously enrolled. Unless the courses fall perfectly, that could result in taking a lot of superfluous courses on my way to finishing the degree, but if Infineon pays, what's the problem? This is all contingent, of course, on taking the job, though this revelation makes it more likely.