Moving from bottle to cup

[figginz]

So I know I'm supposed to move DD away from her bottle now she's over 1. For her teeth. But I'm not sure what kind of a cup to put her on.

She currently drinks water happily from a Tommy Tippee free flow. Also sometimes uses a non spill.

I would like her to have a non spill for milk but am a bit freaked out by all the hideous images of gunk in the valves that have been circulating online. Should I just go for free flow and supervise her closely?

Sorry for the very pfb dilemma!