Id also swap over the 1.0 flywheel. And it kinda depends on the budget but its a good time to change the timing chain, check the valve clearance and set if needed, change the crank seals.
Thermostat and valve cover gaskets are also cheap and id just replace those. Esp the thermostat als its...