Disney Infinity Fans

So while I had everything that released on launch, I've fallen behind on my Disney Infinity collection since then. My question is what should I prioritize getting before the launch of 2.0, what do you think will be harder to come by once 2.0 is launched. And unfortunately, yes, I am obsessed with having everything, lol (even 2 of somethings).

What I still need...
Rapunzel
Ralph
Vanellope
Anna
Elsa
Every Crystal Figure except Lightning McQueen (got at launch)
Retail Sorcerer Mickey (I have the D23 one, but would prefer to leave that in it's display case)
Phineas
Agent P
Glow-in-the-Dark Buzz Lightyear
A couple more Series 1 Power Discs
Almost all Series 2 Power Discs
All of Series 3 Power Discs
8/10 TRU Exclusive Power Discs

I would go frozen characters since they are hard to find. Also Glow buzz does not and apparently will not exist except digitally on PC/iPad

I'd say crystals will be hard to get by then and phineas and agent p. I'd say a frozen play set will come so they won't be hard to get imo

I was thinking of prioritizing Power Discs & Crystal Figures first, since I feel like those are the first things TRU & other retailers will not restock once they're gone. That's depressing about Glow Buzz, he looked like he'd be a cool figure.