Yup that registry edit will work perfectly for you. I have the exact same problem with my Airave. You can do the Mode Operation settings change on the fly, no need to soft reset ever agter the initial registry edit and reset.
You will see a huuuuge battery life increase.
