A question for Steven Pinker's optimism

I would love to be able to believe the message of Steven Pinker's The Better Angels of Our Nature and other works that expound a worldview of progress. But it seems to me that at present those parts of the world experiencing the strongest population and GDP growth are those with characteristics I am not in favor of. The questions I would ask would be:

• What are the GDP and population growth rates of democracies versus non-democracies?
• What are the GDP and population growth rates of secular societies versus those dominated by religious fundamentalism?

And given that a classification between democracy and non-democracy, and between secular and fundamental, is somewhat arbitrary given these factors are a spectrum:

• Are countries becoming more or less democratic?
• Are countries becoming more of less secular?