Kepler
Cornell Big Red
The fix to the house and the EC is to expand the house by 2 or 3x. It hasn't expanded in over 100 years even as population has exploded.
The Senate is what it is, unfortunately.
Add more states. Puerto Rico, DC for starters. I don't know how we combine the 8 states in the empty middle of the country but that should be done somehow.