I am predicting (and hoping) that the concept of democracy will continue to shift towards ever greater inclusion and increased human rights as it has in the past two centuries, and a future vision of democracy would disqualify the current system as undemocratic for some of the points above.

Just like how we don’t view pre-civil rights USA as democratic by modern standards. For example, we would never consider a country with legalized slavery to be democratic today. Similarly a future concept of democracy is unlikely to consider a country which practices the death penalty to be democratic by that hypothetical future standard.