I once saw a Doctor Who sorting that put Rory in Hufflepuff, and I wholeheartedly agree with that. It helps explain my love for Rory, anyway.