stevenz: Hopefully 2.3.4 won't be far off which is supposed to fix most of the battery issues. Not holding my breath though :)
2.3.4 should make a fair amount of difference. It fixes a bug that prevents apps from suspending properly, which causes them to use more battery than needed. Other phones are seeing big improvements with this fix.
In the 22 hours that my phone has been off the charger, my Android OS has used 1.5 hours of CPU, and WiFi Sharing has used 38 minutes. After the 2.3.4 firmware comes out, the OS should go down to under a minute, and sharing down to seconds. That alone will save several hours of battery life.