Done all that.....optimised site etc...In the short term I will develop on this WIn7 machine (where I have all my images etc etc), export as zip and upload from other machine.
In the medium term I am going to look at NOF alternatives - will look at Macaw Franko and one called Muse which was recommended by a former NOF devotee.