I agree that the House system is a mess. I haven't read the books in ages, and my impression of McGonagall could be skewed by fanfic, but my sense of her is pretty much how I described Andromeda above. Feel free to remind me of what I have forgotten!