Well, I've got the easy solution for this dilemna now, for anyone who may want to upgrade to the OTC packaging (assuming your old blue one is still unopened). Target has finally been getting the OTC sets in, and interestingly enough, they've got the exact same DCPI # as the original blue packaged set.
So you can just buy a new OTC one, and return your old blue one if it's still unopened. They cost the same, ring up the same, they're the same in every way in the Target computers, so it's an even swap. No questions asked, and no worries.
I had already upgraded my X-Wing and Snowspeeder, but I'm gonna keep the Cantina set in the old blue packaging just to keep one example of that shoddy design...