ADSL Modem/Router to replace Netgear NDGN3700v1

My Netgear NDGN3700v1 modem/router has recently started giving me enough grief, that I am now considering replacing it.By grief I mean that:1. the ADSL will be connected, but my connection to Vodafone will randomly drop out and i takes a few power recycles to get it connected (could be due to poor phone wiring in the house); and2. It has recently rebooted itself and lost all the login settingsModels I am currently considering:

Netgear D6300

TP-Link TD W8980

I currenly have 10 static IP's set-up on the NDGN3700v1 and wold prefer to set up more. Also like the Genie app (both WebUI and IOS).I am also using a Netgear WN3500RP wifi extender to increase the signal strength to part of the house, so would ideally like to do away with that as well, if possible (i.e. by getting a router/modem with great wifi signal strength).Interested in hearing peoples experiences and recommendations ofr either of the above, or other models.Cheers