My DS2 is 19 months and still has BT bottle, your routine at BT looks good I wouldn't fix what's not broken for now as he's still young. Just make sure you do a little teeth clean after the milk.
Some lo just like that added comfort of the bottle still.