i just have to post this before I go to sleep.
What I have done so far:
Keep same settings as before (lowest brightness, no animations, 4G all the time)
Running ICS and pre-factory reset, I think I got about 6-7 hours with little use.
After factory reset, running ICS, keeping everything the same, I think I can get around 8-9 1/2 hours. So, did the factory reset helped me at all? It seems like it, but wait... I only used the phone for less than 20 mins in total and had it on locked the entire time while I was playing CS. Just right now, it is down to 10%. I'll do another drain and recharge for tomorrow's test of just 3G, where I used to get 10-14 hrs with moderate usage.