It's not a bad decision. But here is why I wish I hadn't bought it:
2. When syncing my calendar, after daylight savings time, everything is off by an hour. Apple online support has a solution for this for Mac users, but unfortunately I use Windows at work.
10. Eventually I will have to send the stupid thing off to get a new battery.
There are only two of these that I will address.
I am a (happy) windows user and a (happy) iPhone user and to fix your problem you must insure that:
1) iPhone: Settings, General, Date & Time is set to: Set Automatically-ON, Time Zone Support-ON, and Time Zone is one that is in your area.
2) Computer: Under your Date and Time properties, Time Zone...that you have checked the box that says: Automatically adjust clock for daylight savings changes.
3) Microsoft Outlook: Tools, Options, Calender Options, Time Zone...insure that you have a match on the time zone selected for all 3 areas and also insure that Adjust for daylight savings time is checked.
With all 3 areas in sync you should no longer have a 1 hour lag and when daylight savings ends...do not change anything.
In regards to your battery...IMHO I think you replace your iPhone with a Generation 2 or 3 long before you have the need to replace your battery, unless you fully drain your battery 100% daily and then a 100% recharge and even then it will last you well over 1 year.
400/365=1.1 years at the above use.
"Charge Cycles
A properly maintained iPhone battery is designed to retain up to 80% of its original capacity at 400 full charge and discharge cycles. You may choose to replace your battery when it no longer holds sufficient charge to meet your needs."
http://www.apple.com/batteries/iphone.html
I highly doubt you have this much use so it should last you in excess of two years, thus my statement...you will have a new iPhone long before you replace the battery.
Hope all of this helps you enjoy your iPhone a little more.
To the OP...IMHO you are the only one that can make the decision of weather it was a good or bad idea. If you are enjoying it and using it to its fullest advantage then you probably did the right thing. If you are having buyers remorse then maybe you should take it back for the refund and wait. However, the release and when and what it comes with are ALL conjecture and you could end up waiting a very long time for a new version to come out. One thing nice about this product is that every quarter seems to bring a software update of some sort and it kind of "refreshes" the current product that you have. No other phone can or has done this before. You stated yourself that 3G was limited in your area, so why wait? IMO 3G and a phone GPS are over-rated anyway and will not be the sole reason for me to upgrade.
Good Luck and Enjoy what you have now!