EDAIN
The Edain should be divided in the House of Hador - lead by Húrin (Aggressive, Organised) , Elendil (Wise, Seafaring) or Elessar (Expansive, Philosophical) - the House of Beor - lead by Hyarmendacil (protective, Seafaring), Beren (Wise, Creative) or Elros (Industrious, Expansive)- and the House of Haleth - lead by Haleth (Protective, Creative), Ar-Pharazôn (Agressive, Seafaring), and Castamir (Expansive, Seafaring).
Calling civilizations "House of Beor," "House of Hador" etc. seems a bit cumbersome, especially when talking about their empires or adjectives. Those houses were only the starting points for long histories, after all. And linking Castamir (a rebel leader in 3rd Age Gondor) to the 1st Age wood-folk of Haleth is a tenuous connection at best.
I would suggest an alternative division:
*
Numenorean Empire: lead by Tar-Aldarion (Seafaring, Imperialistic), Tar-Ancalime (Financial, Creative), or Ar-Pharazon (Aggressive, Seafaring).
*
Arnor Empire: lead by Elendil (Wise, Seafaring) or Aragorn Elessar (Expansive, Philosophical).
*
Gondor Empire: lead by Isildur (Aggressive, Imperialistic), Hyarmedacil (Protective, Seafaring) or Eldacar (Protective, Industrious).
*Maybe also
Edain Empire (representing 1st Age Men): lead by Beor (Wise, Creative), Hador (Aggressive, Organised), or Haleth (Protective, Philiosphical).
Men like Hurin, Turin, Beren etc. were more Great Generals then leaders.
MIDDLE MEN
The Middle Men should be dividedin the Éothéod - lead by Eorl (Aggressive, Industrious), Helm (Protective, Expansive) or Éomer (Aggressive, Wise) - and the Men of Rhovanion - lead by Bard (Financial, Creative) and Vidugavia (Agressive, Protective).
DARK MEN
The Dark Men shoul be the Haradrim - lead by Herumor (Aggressive, Financial), the Easterlings - lead by Ulfang (Aggressive, Creative), and the Dunlendings - lead by Freca (Expansive, Financial).
These sound good, though I'm not sure about Dunlendings; how about adding
*
Druedain or Pukel Men Empire: lead by Ghan-buri-Ghan (Protective, Organised).
*
Variag Empire: lead by Sangahyando (Aggressive, Industrious).
ELVES
NOLDOR
The Noldor should be divided in houses: the House of Fëanor - lead by Maedhros (Wise, Industrious), Caranthir (Aggressive, Expansive) or Celebrimbor (Industrious, Creative) - the House of Fingolfin - lead by Fingon (Organised, Wise), Turgon (Industrious, Protective) or Gil-Galad (Seafaring, Organised)- and the House of Finarfin -lead by Finrod (Protective, Wise), Orodreth (Expansive, Creative) or Galadriel (Philosophical, Wise).
Again, the names sound awkward - and it breaks things up a bit too much. The different civs would quickly run out of city names.
*A single
Noldor Empire would be enough: lead by Feanor (Creative, Aggressive), Fingolfin (Protective, Imperialistic) or Galadriel (Philosophical, Wise).
The various other Noldorin princes would help make up the numbers of Great People.
SINDAR
The Sindar should be divided in: Nandor -lead by Denethor (Creative, Organised) - Falathrin -lead by CÃ*rdan (Seafaring, Financial) and Doriath - lead by Thingol (Protective, Philosophical) or Dior (Expansive, Organised).
These were actually splinter groups from the TELERI. "Sindar" was only one of them. How about the following:
*
Teleri Empire: lead by Olwe (Seafaring, Creative).
*
Sindar Empire: lead by Thingol (Protective, Philosophical) or Melian (Creative, Protective).
*
Nandor Empire: lead by Denethor (Creative, Organised) and
*
Falas Empire: lead by Cirdan (Seafaring, Financial), just as you suggested.
I'd agree with T_F that the Vanyar should be included: they were important culturally, and did take part in the defeat of Morgoth. Saying that they don't count is like excluding the Khmer or Koreans from BTS, just because they never extended their influence as much as the Chinese or Japanese.
*
Vanyar Empire: lead by Ingwe (Creative, Wise) or Indis (Industrious, Financial).
One shouldn't exclude the Hobbits, either. They were at least as significant as Dunlendings - in fact, I'd exlude the latter tribe if it's a question of sticking to a set number of civs. Most importantly, Hobbits feature so prominently in Tolkien's books that they undeniably vital to the overall flavour of Arda as a world.
*
Hobbit Empire: lead by Gerontious Took (Philosphical, Industrious) or Bilbo Baggins (Protective, Financial).
I hope these ideas are of some use.