The movie, without a doubt. The toys/merchandise doesn't even come close. If this was some bizarre parallel world where SW toys were never released, it would not bother me a bit. The movies are what I love, first and foremost, and they are all that matters to me. If I lost it all tomorrow, I'd be sad, but knowing that I could go out and buy the DVDs of the five films, I would be fine in the long-run.
That said, if they do a good, large, plush Yoda along the lines of the Applause one from a few years back (that I never got), I would be a very happy panda.