I agree with removing Good, Evil and Chaos and law with a caveat. As the number of domains increase you get domains that are really aspects or subdivisions of the big overarching ones.
I think there needs to be a domain for "The Law", devotion to the actual recorded laws themselves vs lawful as a concept. Hansui, gruweas and Everventual all have this devotion as an aspect of their personas and associated prestige classes (inquisitor, law caller , judge).