iPhone 3GS

I dropped my hp during lunch today and it went dead on me...
It's the 2nd time it died, thank god my warranty card was extended for another 3 months. It supposedly should expire on 10 June but the M1 lady miswrote it as 10 September hee...
With the new iPhone 3GS launching soon, my heart is itching for a new phone...
Should I or should I not?