I'd concur. There is certainly something up with Wi-Fi....when connected to Wi-Fi, the batter drains within around 6 hours (even if IDLE and no downloading/uploading). When Wi-Fi is off (and network set to 2G rather than 3G) the battery is perfectly happy lasting 24 hours at least.
Lets hope this is something picked up by the next firmware update