Well I would have to say, and this is just my opinion, if you want better performance then Gingerbread is the way to go. Battery life is based on what you do with your phone. What apps you use most, things running in the background, etc.
Don't be scared away from Gingerbread because of what you hear. Most of what you hear about Gingerbread is it's inability to be rooted. But if you download and flash one of the GB releases from Team Black Hat you will not have that issue because they are already rooted.
I'm assuming you are still running the stock Froyo (2.3.340) correct? If that is the case all you would need to do to upgrade to Gingerbread is first, unfreeze the bloat you froze. Keep your phone rooted with z4root and install Droid 2 bootstrap.
Follow method two and download the two files for flashing. here is the link,
Official DX Gingerbread 2.3.3 (4.5.596) Release Thread - Something for everyone
Place the two files on your sd card and load up bootstrap and click on "bootstrap recovery" then click on "reboot recovery". This will load you into the clockwork recovery menu. select "install zip from sd card" then "choose zip from sd card"
select the first file for flashing and flash it. Once done go back by hitting the back button on your phone and select the second file and flash it. Do NOT leave recovery before you flash both files. Once this is done again hit the back button to get back to the main window and click on "wipe data/factory reset".
This is a step you would do after you rebooted the phone because 9 times out of 10 you would bootloap and/or get stuck at the "M" logo. This is normal though. That is why you do the factory reset. but i like to do it before i leave clockwork recovery because I know chances are it's going to bootloop so I get it out of the way.
This seams complicated but I assure you it is not. If you have any other questions come on in and ask. We are here to help.
NOTE: Keep in mind this process is based on your phone being completely stock Froyo. Meaning no apps have been removed and the phone is in the same condition it was when you first got it. Being rooted is necessary and unfreezing the apps you froze is necessary. Some say it is not necessary to unfreeze bloat if you're flashing but i don't like to take the chance. Also make sure your battery is fully charged before you start.