It will take some time to re-set the elements of the S1 system. I was offered a caravan style mobile environment which needed to be totally stripped down and rebuilt, but it is viewed as too costly an option. I have it on good authority that the weather forecast in relation to getting flooded out again for me is nil, so onto option 2.
Re-setting the large space at home is looking good, but I will take my time to modernize and streamline this time around. If its worth doing, then its worth doing well, and old saying.