There are still talks about a new iPhone coming out soon, i'd wait a little longer to see if that is true. Would suck to get a iPhone 4 when a 4GS or 5 will be released shortly.

If you really need a new phone check ebay or CL and find a cheap basic phone to hold you over.

BTW - Nothing beats iPhone. You are familiar with it, you already love the touch, can't go wrong with an iPhone.