Yes, indeed, I agree with all your points. And in pretty much all cases I would opt for "gradual refactoring" (and hopefully with lots of tests before starting).