Unless you absolutely NEED a new phone, at this point, just wait.
Apple is likely going to release an incremental upgrade, IMHO. Probably like what they did with the 3G and the 3GS. Maybe a slightly faster A4 chip, more RAM, but I doubt it's going to be anything that is a radical departure from the iPhone 4.
But, I could be wrong.