The battery drain issue is related to your wifi router.

You need to install osso-statusbar as an application. It allows you to monitor the processor activity of the unit. Install the statusbar, and then watch your CPU usage on and off wifi. If you connect to your router, and your CPU usage spikes, you have incompatible router settings.