I just bought a magmag bottle that has interchanging lids to a sippy cup then a straw. It is a #5 plastic bottle (a 'good' plastic if you are worried about BPA) and it suitable for warm liquids.
HTH