Tech billionaire also rows back on threat to decommission spacecraft used by Nasa amid signs pair’s row may be winding down