Something to consider if your router is supported by dd-WRT. dd-WRT is a 3rd party firmware that can be loaded on a broad range of broadcom based wireless routers / access points.
UMA - DD-WRT Wiki
I flashed my 300N using this firmware so I could take advantage of the WMM protocol the 8320 uses and it seems to work great. Battery life seems to be much better, but I will know for sure after I've got a few days use under my belt on the new firmware.