I would recommend buying a discrete modem and separate router. Routers have advanced much faster and buying a discrete router allows you a much wider choice. Use the Xfiniti page to choose a modem -- http://customer.xfinity.com/help-and-support/internet/list-of-approved-cable-modems/
then pick any router.