Maybe I'm crazy but if the new iPhone has iChat capability then it will surely use a lot more data. If you switch to the 2gb plan when you upgrade you'll get an unpleasent surprise when you use that cool iChat video conferencing and in a matter of days get a message saying you've reached your limit. I would definitely stick to the unlimited plan!
*
*