Vagrant, have you considered doing more than the simple two question approach, allowing for "double-checking" of a person's type, in which seemingly conflicting preferences result in an X preference? Combine all of your prototypes, if you will.
I think this is an excellent suggestion.
"Sentiment without action is the ruin of the soul." - Edward Abbey