Well, the battery is removable, so I'm sure you'll be able to get a second one if that becomes an issue (but it sounds like the battery life is a bit better than the G1 so it can't be that bad).
As far as waiting, like someone else said, if that's your philosophy, you'll always be waiting. What Apple did sucked because the iPhone 3G really included features that should have been in the first phone. I don't feel like the Pre is really missing anything as far as hardware. The things I'd like to see are all software, which can be remedied quite easily through an OTA update.
I think you'll be quite happy with this phone and I really don't see them coming out with a second generation Pre anytime real soon. The Eos? Yeah, but that's a completely different device. Just get the Pre!
