Tbf everyone knew that the electoral votes of the district part was going to need to be handled eventually, the simplest thing to do is to just make the district the federal buildings and add 3 EVs to whoever won the Electoral College, if there's a 269-269 tie, then they could be left blank or go to the winner of the popular vote.
I'd rather the three electoral votes of the now truncated federal buildings only District of Columbia to go to whoever wins the national popular vote, but I'd be fine if they went to the EC winner if it meant DC statehood would happen.