I would consider something like this:



This way, even if the end of the water bottle is close to the headtube, you can still slide it out sideways.