I need some advice............

I'm in the market for a new camera. I think I have gotten to a point in photography where my current camera can no longer do what I want to do. So now I am looking at DSLR's. I have two in mind, one is the Canon EOS Digital Rebel XTi, this is the cheaper of the two, it has some cool features, like the ability to keep its light sensor clean all by itself. It has all the options of most higher priced DSLR's, BUT, it has a very crappy battery, and when using a camera like this a good battery is a must have item. I know I can just get a handgrip battery pack, but i'd rather spend that money a another lens other than the kit lens that comes with it. The other camera is the Nikon D80. This a few hundred dollars more, but it has the better kit lense with it, plus the battery is twice as big as the Canon. Tough decision. I have been spending time on Flickr looking at pictures taken with both cameras to get an idea of what each is capable of. And so far, it looks like each cameras limitations lie with the user and not the hardware. Like I said, I want opinions.