Ref your water bottle/ frame bag problem. Did you find a solution? I've just taken delivery of an Alp kit frame bag and am having more trouble than you. Only have a small frame, so can't use either of my bottles when it's fitted. Had a look at the Arundel side loading bottle cages on wiggle. May be an option, but 30 quid each, not cheap.
Don't know if you're aware but in France All church yards have a tap outside,for people fill flower vases with, that has potable water. Handy to know if you didn't.