Personally, I consider the definition of "swing state" to be a state that has voted for both parties at least once in the past three elections. While this definition isn't perfect (see: IN), it is more often than not a better one than people conflating "swing state" with "competitive state".
I'm sorry, but this is simply not a good barometer for swing states. Going with that measure, this would've been the swing state map for 2008...
And here is 1992...
***************
To your point, I am not conflating "swing" with "competitive"...that is actually my whole argument. NC was "competitive" and "close" in 2008 because Obama had a large national lead. The fact is that NC still had a significant R lean...he won it by 0.33% while winning by 7.26% nationally. Just as if Trump were to win by 7.26% in 2016, he would've most likely won NM by 1.14%. NM would've retained its significant D lean...but the nation would've pulled it to the other side.
My point is that no state that leans ~6% to either side should be considered a "swing" state. Both states would and should only be considered "competitive" in the case of a large national lead for either party.