Edac,
Any reason you can't replace the Ubee DVW325 with a cable router that supports WiFi ?
In the long run, that would give you most peace of mind, because troubleshooting can be tricky once you start putting boxes in front (double NAT breaking stuff etc).