IMO, IME, the fluids intake is being done backwards. Start drinking fluids, especially water, as soon as you are out of bed. Drink extra 30 minutes to an hour before a ride, if possible. Stop drinking so much water in the evening. Also, from my experience, a check up by a professional is a good idea. I found that when I start drinking fluids early in the day, I am not as thirsty when riding, and I have been able to cut back in the evening without feeling dehydrated. Then I feel the need for water as soon as I get up.