I just got my iPhone 4s. It has iOS 5 on it which I kept. Previously I had an iPhone 3GS which was jailbroken with lots of tweaks. However it died in an unfortunate water drowning! I don't know whether to stay on iOS 5 or to upgrade to 5.0.1. So far my battery have been so so. I recharge it nightly. It was better than my 3GS. Please advice.