I know you said you don't want to store their water in plastic, but honestly I would reccomend using a plastic water dispenser. The birds have easy access to the water but it's harder for them to poop in it. It works great for my birds. Here's a link in case you don't know what I'm talking about.
Pet Shop Direct - Kazoo Bird Auto Feeder 16cm