Plain Modem Always. ISP provided routers are usually not very good, then you are locked in, can't upgrade with your own, plus the ISP equipment is usually located in a corner of the house, you want an WIFI router to be situated in the middle of the house for inclusive coverage, or at least be move-able in cases of multi-router deployment for large square footage.
I will let others chime in for recommendation.