LeeDroid 2.1 is supposed to be coming tonight.
Out of interest, how difficult is it to S-ON and restore default recovery? I've got the nandroid backup of my stock rom. But obviously the recovery needs flashing back to stock (any link for that?) and return to S-ON.
Then again, is S-ON really required? As HTC are releasing a S-OFF unlock tool soon? Or are they going to take the stance that if you S-OFF it, it voids warranty?