Thanks Dave.
Will do it that way for those I want to keep. My current internet connection is 128 Mbps down and 10 Mbps up so this seems to cope quite well provided there is enough upstream bandwidth.
Oh by the way watched your teardown of the insulation tester, did you manage to repair the potting compound?!