I'd say for both, just because it'll probably be cloth and they'd both used them at one point or another in the film.
I was honestly floored by the difference in 1999's figure, and 2012's figures. The sculpt, the deco, the likeness of Olie... Really, that's fine work. I like the helmet variation too, for a little extra umph. But really, the helmet sculpt and detail is also much improved. Those are buckets with some intricacy.
I'm a big fan of these kinds of updates... Can't wait to see a little more in the near future. I think 2012 and TPM3D is going to be a massive push for Hasbro and Star Wars at retail.