I am currently using a Rixen/Kaul KlickFix bottle cage adaptor to hold a bottle on the front of the stem riser. This puts it out of the way but I have never had a problem of hitting the cage with my knees (when it was located behind the riser) as I do not ride the Swift out of the saddle. I lowered the gearing, but if the hill gets too steep, I get off and walk - what's the rush? I once overtook a cyclist who was using very low gears to climb a hill but he was travelling slower than I could walk!
The UK agents for Rixen Kaul have ordered a couple of new bar bag brackets that fit directly onto the long stem risers of folding bikes - without the need to use a 'T' bar (pictured in previous photos of my bike). When they arrive I will swing the bottle cage back behind the stem riser.