Thinking about it some more I'd be happy with username+password for non oauth accounts as opposed to email+password - although I'm not sure that's your concern.

Happy to have a chat about this.