What Should I do??

Ok so as you all know the new iPhone 3G S was announced monday. I have the iPhone 3G so to upgrade it would cost me $500.00 from AT&T! I really want the new iPhone 32GB but is it worth it? AT&T said that in december of this year I can get it for $300.00 but should I wait or no? I also want a new MacBook Pro 15" which I do have the money to get but if I got the iPhone I wouldnt right away.

What do you suggest I do? In a word HELP