That's a good way to properly isolate the case. Don't forget to check the ethernet cable connecting the E4300 router and the D-Link switch. It can be the culprit 
.
Anyway, hope the firmware update would fix it. Make sure that you did a factory reset after the firmware update. This will properly sync the new firmware on the router.