Just a quick update.
I found the original swiss bottle and cup combos at Cheaper Than Dirt for 7 bucks for the set.
The cups are single wall aluminum(would be nice in stainless) so I should be able to cook with them over a fire.
This should make my everyday fanny packs and work kits much more streamlined.
The bottle seals with a cork so I'll probably use the new bottle with the old cup unless I can think of something better.
Thanks,
Steve