Throw out your consumer grade router (Score 1)

Ive' had (at best) mixed results with any consumer grade firewall/router. A UPS is an excellent start, but your best bet is to avoid them all together, and use that old PC lying in your closet. Put two NICs in it, and download pfsense (google it). You'll never buy another, and you only reboot when the power goes out.