NorCal,
Watched your video and it is VERY cool. I am impressed!
Since you are so good at woodworking. I think you can make switching bottles a little easier by adding a spring-loaded arm, like this one but instead of aluminum alloy you can use wood of course.