I dunno how it is around LA proper, but I'm noticing more and more stores not restocking Vintage. I'm still thinking that, despite Hasbro's unwillingness to recognize it, most stockers see "Star Wars plastic men" and don't pay a bit of attention to the packaging.
I saw two times where there were non-TPM Vintage figs on the pegs in the last, I don't know, four months or so here in the west IE. I've about given up on new stock.
I predict that the upcoming Star Wars Episode VIII: The Last Jedi film will include the word "and." Multiple times.