I think we are slowly heading in that direction.
There's plenty of signs for the former (VA going from solid R in 2004 to solid D in 2016, NC going from solid R in 2004 to a swing state in the last few elections, GA and even TX/SC apparently narrowing significantly) but very little signs for the latter. Back when Trump wasn't getting obliterated he was polling close in PA, but so was Romney at certain points. He hasn't been doing particularly well in MI, WI, or NH. There are a few signs in ME and IA, but that's it.