iPhone vs iPhone 3G Battery Comparison

I have been reading a lot about the upcoming iPhone 3G lately. I currently have the original iPhone, and it has been the best phone that I have ever used. One thing that I have been having trouble finding online is a direct comparison of the battery life of the two phones. Here are my findings based on the estimated tech specs that Apple has given. Please note that real world times will vary.

Talk Time – Edge “2G”
IPhone - 8 Hours
IPhone 3G - 10 Hours
Talk Time – 3G
IPhone- N/A
IPhone 3G - 5 Hours
Standby
IPhone - 10 Days
IPhone 3G - 12.5 Days
Internet – 3G
IPhone - N/A
IPhone 3G - 5 Hours
Internet – WiFi
IPhone - 6 Hours
IPhone 3G - 6 Hours
Video
IPhone - 7 Hours
IPhone 3G- 7 Hours
Audio
IPhone - 24 Hours
IPhone 3G - 24 Hours

Will I be buying the new iPhone 3G? At this time I would say no. I will not be in the long lines on opening day. I already have a great phone. I am almost always around a Wi-Fi Connection. I already have access to GPS. My 8 GB iPhone is nowhere near full. I will be upgrading to the new software and downloading apps. Pressure and hype could change my mind and I may get one later on. I will see what others are thinking of their new iPhone 3G. Will are you real world battery times? Are you going to be upgrading your iPhone to iPhone 3G?