That's tough, I've been there for sure. Personally I migrated and molded my career to better fit my psychology. This pretty much ended procrastination as a work issue, though every once in a while there's a real tough setup.

I also built a productivity system around the concept of modular leverage as opposed to using the same tools every time.

But it turns out there are whole careers and things that can be done at/for work that are a better/worse fit for just about everybody. The worse-fit items are natural to procrastinate, no matter how many productivity methods you have. So at some point it's important to be able to set a boundary and loudly proclaim, "this isn't working."

(Also I got kind of upset about the word procrastination itself. There are often other words which fit better and help to understand and solve the problem faster.)