I would make all Oligarchies have Forced Labor and Communal Corruption.
I wouldn't give Sparta Xenophobia, because there were times when they were accepted with open arms as the liberator of the Greeks (of course, Athens didn't do this, and rebelled against Spartan rule).
Is Worker Rate of 1 normal or slow? Oligarchy should definately be normal, and maybe Spartan Oligarchy could get a boost (so those terrified Helots won't get killed for not working hard enough). You might want to allow Athens to stop rebellions with military police (MP of 1)
Also, you forgot the army size.
I would say
Democracy: None (Athens had a large treasury and income, but was dead broke at the end of the war).
Oligarchy: 6/6/6 (Give the Boetians a large army for their size)
Spartan Oligarchy: 6/6/6
Tribal Federation: 2/3/5
Monarchy: 2/4/6
Macedon should be a Monarchy, IMO (I know their leader was King Perdiccas), but Tribal Federation might work. Monarchies probably should have payed labor, but I'm thinking of the Great King of Persia, not the King of Macedon.
Rome
could be a Republic, but it could just as easily be an Oligarchy. Carthage's government was similar to Rome's (assuming they weren't in control by a tyrant at this time), but I never remembered hearing it refered to as a Republic.
Thessally, Thrace, any other barbarian in Norther Greece should be in Tribal gov, Sicily is a democracy, Italic Greeks are either Democratic or Oligarchic (I can't remember), Etruria would be an Oligarchy (I think

).
That's about it.