I haven't been able to find a "final" solution. Most recently I've been writing things down with pen and paper to keep me on task. To make the ethereal physical and break it down into steps and checklists.
Again totally recommend this video on the wall of awful for ADHD procrastination https://www.youtube.com/watch?v=Uo08uS904Rg