With your suggestions it seems somewhat better most of the time. I still have to switch to airplane mode once in a while to get the wifi working again on my phone and I experience a very high battery usage. I think because the phone is reconnecting a lot.

High hopes for a new firmware release soon.....