Glad it is still all looking good then. If you find it is the homeplug device and you need it to work again, you could always try putting the router power supply on something like
one of these.
I've never used one of these devices myself (so can't endorse it, or even say if it works!), but it figures, that if the radio frequencies that the home plug adds to the mains (deliberately of course to send the network round the house), is upsetting things, then some sort of filter to remove that from the router power supply should hopefully restore normality to your broadband.
One review specifically mentioned using the device to to filter his treadmill that was causing his broadband to drop out. In his case he used it on the treadmill (i.e in reverse from intended use), so the whole ring main was filtered and the treadmill alone was isolated. Of course, in your case, the point of using the homeplugs is to put their signal out onto the ring main, so you would use it the correct way round, to isolate your router and anything else required from the noisy mains via the filter, leaving the homeplug to be plugged in direct to the mains and do it's job without disturbance!
If you do go down the mains filter route, I'm sure others would be interested to know how it works out for you and to know what you think of the device.
Hope you get there soon, and all devices correctly wired and working again.
Mike