Electoral College Solutions

Personally I believe our electoral college system works pretty well but, there is one thing I would like to change about it. I agree with the fact that based on population you get your electoral delegates but I disagree with the fact that every state gets an automatic two delegates because they represent the senators of each state. Because I believe fully on population vote, its not fair for Wyoming to get an automatic two when they should only have one, this makes there vote "worth" than a person's vote in lets say California. By doing this it should eliminate that small chance that the president would win the electoral college yet not the popular vote. Because with the smaller states they get those automatic two votes if the state was won so it seems unfair for that to happen. So by doing what I propose, the nominee should always win both the electoral vote and the popular vote. That would eliminate all of those crabby annoying people who would complain about how unfair the system is. And lastly another good thing about taking the automatic two votes is that since there will be 100 electoral votes taken away from the college they can re-calculate on how many states should get electoral votes so for example if before it was one vote for every 100,000 people now it could be 1 vote for every 80,000 people (just an example not accurate). So that is the last positive thing to my proposed solution to fixing the electoral college.