I don't see the EC as overtly undemocratic: it will not vault a 35% candidate into the president's chair. In terms of popular vote, Mr. Trump was still a viable candidate in 2016 and in 2020. Why was he a viable candidate in the first place? That is the question we should be asking.

The EC does have its advantages in modern time. If an election is close in EC votes, the various institutions need only focus on the races from the close states for the recounts. If popular vote was used to elect the presidents, then every ballot box in the USA would have to be recounted. It would be very difficult to place credible oversight on all these boxes. Be careful for what you wish for.

You have acknowledge the historical reasons for the "two senators per state." Whether that history today is relevent is another matter. What really matters is that the Republican Party gets a little edge with the two-senators-per-state: the R's will not let it go. They are just as partisan as the supporters for the abolishment of the EC.