That's basically a massive retcon though isn't it?
There's no evidence, textually, that it has anything to do with the student's choice (with the possible exception of Harry, who himself continues to insist the hat chose for him), until, years after the fact, after years of people, including...