I am of the opinion that the electors for the EC should be assigned on a per congressional basis - whoever gets the most votes in that district, should get that elector.
The two extra "senate" electors should be assigned as follows:
One elector goes to the candidate with the most votes in the totality of the state (if a tie, Governor decides)
One elector goes to the candidate with the most districts won within the state (if a tie, Governor decides)