9400M 13" MBP vs 200M 13" MBP?

Yo guys,

I currently have a 13" mid 2007 MB with a really bad video card.

The 9400M 13" MBP is selling for $1099 via student discount and I can get a free iPodtouch (which I don't need because I have a 3G iPhone). 

The 200M chips have been shown and I have a strong hunch at MacWorld in Sept-Oct, they will update the MBP with the new video card.  The performance difference between the two chips is very big, however the 9400M runs TF2 very well, and I'll be mostly playing that with CS 1.6 and Guild Wars.

If I pick up the 200M MBP, it won't have a student discount and will be around $1199, and I won't get the free touch. 

What would you do in my shoes?