I usually sort the charries myself too, I also usually assign wands based on the character type as well. Pottermore is always my friend with that one. 

Well, actually I usually just use the pottermore wiki, it's just easier than dealing with the site itself.