What bottle/cup?

Our little one is 12.5 months old and had 1st appointment at the dentist. Both the health visitor and dentist have advised no bottles beyond 12 months to help oral development. He currently uses a tommee tippe closer to nature bottle for his morning and evening bottle and during the day he uses a tommee tippee sippy cup or a tommee tippee straw cup (see picture). What bottle/cup is best to help his oral development? Now his teeth are coming thick and fast we are keen to slowly replace his close to nature bottle.