So the answer is yes, time and practice.
I’d also take a look at your biz model. If you sell speed. Then avoid surgery and practice doing it with what you want.
If you sell custom unique bespoke designs/sites, then practice the process of the surgery and find the best time to do it in the project. may be its better at a different point in time 🙂