How to organize a website layout?

Question

User interface

Initially: the designer drew the layouts and coded them.
The programmer implemented the back and front, after which he pulled the layout onto the site.
The site was launched and during the year, analyzing user behavior, much was rethought and improved. The site has become more functional and convenient. But due to the large number of iterations, added and removed elements, the initial layout floated (outwardly now it looks like three plus minus).
Now the project has more or less settled down, it remains to restore beauty again. Externally, the current site differs from the original version by 30%.
The question is, how to organize the re-layout?
Option 1.
The designer draws new layouts for the entire site, typesets them into code. The code is given to the programmer, he reloads the entire site.
Pros: the code will be clean throughout the site
Cons: long, expensive
Option 2.
The designer draws new layouts of the changed parts , typesets them into code. The code is given to the programmer, he re-stretches the curved parts of the site.
Pros: cheaper than the first option
Cons: those parts of the code that will not be redesigned may be curves. (Although no one bothers to fix the layout after)
But, perhaps, I do not see the whole picture and there are still problems. How will it be properly organized?

Answer 1

That's right - the first option.
Cheaper - the second.
What's the trick here, talk to the customer who pays the money, and not with the toaster.

Answer 2

In almost any industry, there is a moment when you want to do everything "in the mind" anew, whether it's design or the most fierce assembler. Try to answer the following questions - what do you want to get in the end? Cleaner design? Fix behavior? Add adaptability? For what purpose do you want to "comb" everything? For future updates? For something else?
If you have enough time and money - of course, redo it, otherwise decide on the goals, means, time, and then you can already specify the question - for example, you plan to increase the flow of users, or you need to increase the conversion, or there are complaints about bugs