Yeah, that's a great enhancement to the original - having the queen around lets the computer avoid mate for longer than its horizon, so it prefers keeping the queen. Then again, I am not sure the computer will lose in even this scenario - it has so many queen checks that my evaluation of this position after 10 minutes of playing with it is "screw it", although I feel there has to be some way of punishing it.