D.T.
You can keep him on both until he begins getting teeth, then you'll want to start slowly watering down his bottle until all he's drinking is water. He'll either find the bottles no longer to his liking or he'll be drinking water before bed which will be much better for his teeth.
My daughter is 2 and only uses the pacifier for bed and only bed. They aren't really bad for the teeth and I would much rather her use it then her thumb and develop an overbite. Some moms suggest snipping a little hole in the pacifier so it looses it's shape when sucked on.
Basically, it's up to you what you do. Changing the bottle to water is a good idea, but there really isn't any reason to take him off the bottle completely until he's ready for sippy cups.
Good luck!