Revamp for controversial ‘living wills’ law after year of chaos