Can we identify these Harry Potter Lego microfigures?

In rows from top to bottom, and numbered 1 to n from left to right:

First row

1. Harry Potter. Dark hair, glasses, what may be a hint of a scar.
2. Ron Weasley. Red hair, Gryffindor uniform.
3. Hermione Granger. Brunette, Gryffindor uniform, next to Harry and Ron.
4. Neville Longbottom? Gryffindor uniform, obviously not a Weasley from the hair; Neville is arguably the next most important Gryffindor student other than the Trio.
5. Draco Malfoy. Blonde/white hair, Slytherin uniform.

Second row

1. Parvati Patil? Darker-skinned than the other Gryffindors, and Parvati is the only Gryffindor student whose name suggests she's not Caucasian.
2. Cedric Diggory? Hufflepuff uniform. Not (m)any other Hufflepuffs of note.
3. Crabbe or Goyle? Slytherin uniform, appears to be male from the hair, not sure who else it would be.
4. Luna Lovegood. Blonde, Ravenclaw uniform.

Third row

1. Albus Dumbledore. Colourful robes, grey hair and beard.
2. Minerva McGonagall. This figure is female (note the shape of the lips), and this row appears to be Hogwarts teachers/staff. McGonagall is a more important female teacher than the others.
3. Severus Snape. Long black hair, black clothing.
4. Remus Lupin. Red-brown hair, facial hair, wearing a suit.
5. Argus Filch. Balding on top, long grey hair on the sides; apparently Filch is included, and this was the only unclaimed spot.

Fourth row

1. Voldemort. White skin, bald, wearing green (snake-like) clothing.
2. Bellatrix Lestrange. Female, dark-haired; Bellatrix is the next most powerful/important villain after Voldemort.
3. Dolores Umbridge. The clothes are pink, and she's in the row with other villains from the books.