just an update guys. turns out this wifi fix isnt that much of a fix. i managed to get 2-3 hours more with my standard usage of 3G, widgets and IM accounts without WIFI.

Looks like the real killer is 3G, not WIFI.