Whenever you replace it, get a separate AP and modem.
Also, DOCSIS 3.1 modems come with queue management. You may benefit significantly from an upgrade even if nothing else changes.