Ok, I'll give that a shot if z4 doesn't work. I remember that I used it back when I first got the phone successfully. I'll see what happens.
UPDATE: Well, I'm booting into the new cm7 now. Might want to rethink letting people know that they shouldn't wipe data. I'm not 100% certain that's what did it, but a full wipe resolved the problem.