It really comes down to the application that you are running. If you are doing a lot in something like Adobe CS then the Intel® Core™ 2 Quad would offer you some advantages, heck most games right now will take advantage of up to 3 threads so the Intel Core 2 Quad would be very good up to this point. Now if you are doing a single threaded application that speed makes a difference then the Intel Core 2 Duo is the best. So go with option 2 most likely.
Intel Enthusiast Team