I'd do the same thing, better to spend a little more then to be disappointed or even worse: a battery that explodes, whould be the first time...
[QUOTE=Really hope to get my hands on the N900 real soon (Friday).[/QUOTE]

I don't think you will be disappointed! As long as you keep the WIFI off when not needed ;-)
That was the only minus I could find on the whole phone. I really LOVE the device :-)
I guess there will be a fix soon for the wifi that, lets hope so!