After a couple of days of making sure that I drink more water, especially just before going to sleep, I can say that I've had 2 nights of reasonable sleep. I've still woken a few times but have been able to go back to sleep very quickly. It was the weekend though. The litmus test will be if improved sleep continues during my working week.