I say vote by county. Most counties won in the state gets the electoral vote. Congress stays the same and the senate is one 6 year term and out.
This does one thing. It prevents widespread fraud as it becomes contained to one county.
I would prefer a system where every state adopts the Nebraska/Maine model of awarding electoral votes by Congressional district, with the two “extra” electoral votes in each state awarded to the candidate who wins the state overall.