I think the first option will gain you more on the long run, the machine can be incredible at gaming as well as general apps, video compression etc. Also as games move to more threaded, Q will gain on the E. Also the perceived difference between GTX 260 vs 280 aren't very clear at this point. If they are huge, then I'd consider option 2 if you game a lot. But if you do other things on this rig, that Q is ultimately going to save you loads of time also you can always go with better vid card later as they come. So the main thing is a) do you do other things besides gaming b) how much fater is GTX 280 vs 260. These two question is vital.
BTW, consider the GSkill DDR2-1000 kit. cheap and fast. A friend Bought a set couldn't be happier.