@K13RAN
I agree with Doc and Moscow - I would try a factory reset first to clear up problems with your DInc.
Make sure you copy all your pic's and videos off the internal memory and save them to your SD card. Also, if SMS is important to you, there are several apps in the market that will backup and restore SMS.
Also, if your contacts are not stored on Gmail, back them up from the people app, under settings -> import/export.
Then in the Settings menu under privacy, there is a system reset option.
Make a list of what apps you use regularly because the market will remember what paid apps you have but not the free one's. (Though I've heard that the web market now saves free apps though I have not looked yet to confirm)
It should take about an hour or so to reset and get everything back to the way you like it. You will most likely find that you have a ton of apps installed that you never use. Skip those. You can always get them again if you do find you need them later.
Frankly, I have an Original DInc as well and there is nothing on VZW I would burn an upgrade on now. The DInc 2 is nice, but not a big enough improvement over the OG to warrant an upgrade.
Wait for the summer or fall to see what comes out. As far as the iPhone goes - wait for the 5 to come out if you decide to go that route.
Oh and Netflix came out in the market yesterday, and the DInc is one of the few rollout phones supported!

Yeah mighty DInc!
Good luck. If you have a problem with your reset - throw a post up in the DInc forum. Lots of very knowledgeable folks there.
EDIT: Oh - as far as battery - I've resigned myself to the fact that as a heavy user I will have to get an extended battery for any Smartphone I buy. It's unfortunate but a small OEM battery is one place where the Manufacturer can cut costs. Sad but true.