Well a majority of people chose Hillary. And to your post a small number of people in those swing states put Trump in office.
And I read an article that was saying in a few more decades 50% of the population would live in 8 states meaning the 84 seats in the Senate would be represented by just 50% of the population.
I don’t know what the answer is, but on a national level we’re quickly going to be diluting and enhancing votes due to population concentrations.
If Trump wins he will probably lose the popular vote again.
Florida is going to be a crucial battleground State again next year. As for Florida, I would say that Trump has about a 60% chance of winning that State again. Volusia County, along a few other Florida counties have gotten much more Republican leaning over the last several years.