Thanks! We have enabled email signups now :)
Looks like you've got it covered, but I thought this worth mentioning anyway. Facebook has a new registration/Connect option that can fall back to a normal form for those w/o FB:
http://developers.facebook.com/docs/plugins/registration/
Implementing it today on a client's site, its not too bad.
Add a standard login process and I'll check it out.