yup run the modem as a modem,or bridged, setup a router ( i like the dual-wan virtualized pfsense) going to a switch (decent vlan switch could use reduce wiring procurve 1810G-24) then hang a wifi AP or two off the gigabit - (WZR 2.4ghz 300 or 450 airstation ) - super solid design.
modem -> router(hard or soft) -> switch -> ap = win win.