You could do a Domain with its listed Deity(s). Pretty much the opposite of your first table. Through the table would probably be pretty big considering the Chaos and Evil domains.

Other than that, you have more than made Domains easier to work with.