I have the original 2007 iPhone with the original unlimited EDGE data plan, for $59.99/month, which comes to $71/month with all the little charges. If I upgrade to the new iPhone 4, will I have the option to get an unlimited data plan, or is that only for people who had a 3G unlimited data plan?