There is an easy fix to the Electoral College though. The number of electoral votes a state gets is equal to the number of senators plus the number of representatives it gets.
The number of representatives has been fixed by statute at 435 for a century now, which has led to drastic decrease in the level of representation (more constituents per representative). All we need to do to fix the Electoral College is to bring those numbers a bit closer to historical norms.
If you quadruple the number of reps, then the distribution of Eletoral College votes is going to resemble the underlying distribution of population a lot more closely. It should also help make gerrymandering a bit more difficult as a side benefit.
The Senate has always been a poor idea right from the start (especially in its original conception as a body that is appointed by the state legislatures rather than elected) but there's really not a lot we can do about it at this point. It's essentially been a regressive and negative force on American politics right from its conception.
The Electoral College, however, is trivially fixable even without an action like the National Popular Vote Compact. We literally just need to crank up the number of reps and it stops being an issue (even if the root problem isn't actually solved).