I've been leaning towards 'fix anything broken now as repair only gets harder/move expensive from here on out'.