Good point about the swing state polls being closer than the national polls, but that's offset somewhat by the fact that the amount of swing states has gotten larger, all at Trump's expense.
Arizona, Georgia, Iowa, Ohio, Florida and NC all would've started the cycle pink, but now have to be considered toss ups. On the other side, I can't think of a single light blue state we've had to add to the tossup pile.