I have a BSNL Type -2 WA3002G4 Modem which has been giving me all sorts of problems , the biggest of which has been very poor Wifi coverage. I am looking for a good alternative , which can give me the best coverage possible.

Is it better to get a modem+router combo or have a separate Modem (in bridge mode) and add a wireless Modem to all the authentication in PPPoE mode? Which will be a better approach?

For the separate Modem and Router, how about the

D-Link DIR-825 Extreme-N Dual-Band Gigabit Router and D-Link DSL-2320B ADSL2+ DSL Modem

Can anyone provide any feedback on these products or suggest any better ones?