Try olive leaf extract oil. (The oil not tablets or pills) Just a small teaspoon twice a day. Drink a cuppa with it as it has a very sweet bitter taste.
The massive high levels of antioxidents (30 times higher than olives) will boost your energy levels naturally. Also it is one of the best natural aids to arthritis. I have seen people to the point of being wheel chair bound with arthritis who have regained their mobility and lifestyle.
Regarding sleeping better. Tonight when you retire to bed try lying on your side for about ten minutes in the dark. See if your breathing through the nose is better lying on one side than the other. If you find one side is beter than the other (clearer) try to go to sleep lying on your good side.
Regarding sleep. If you let your head warm the pillow then turn the pillow over to the cool side it is more restful. If you wake during the night try once again turning the pillow over.
As regarding drinking plenty of water. Yes it is good for you but not for 3 hours before you go to sleep as you will have to awake through the night to vist the toilet. Also if you should visit the toilet do not switch on any lights. Just use a small dim torch.
Another thing you should consider, drinking plenty of water maybe fine. But the constant consumption of water containing Chlorine destroys the bodies intestinal bacteria which is needed to adequatly remove minerals and vitamins from your food. So even though you are eating well you may be lacking much needed trace elements.
Many people drink bottled water from plastic bottles. This is fine if the water is kept cool. However because much bottled water is not Spring water as stated but simply tap water put through a "Revers Osmosis" filtration system. It is so pure that it will sometime leach the plastic from a container when it becomes warm. Once in the blood stream the plastic residue can cause massive and sometimes fatal results (Cancer).
Personally I drink water from the tap that passes through a small charcoal filter to remove Chlorine and other metals. Bottled water costs $3,000 for 1,000 litre bottles. Town tap water of good quality costs (for the same quantity) $3 per thousand litres
Another thing you should not do if you want to get a good nights sleep is sit in front of a computer or the TV for at least 3 hours before you retire.
Hope this has helped somewhat.