Try to decrease your reliance on self discipline.

IE, get external forces working in your favour. You could use a coach or psychologist. Commit to tasks. Make sure they check up on you. Work closely with others. Pair programming or an environment where someone is waiting for you to finish something so they can start something else. Seek environments where you can't hide procrastination. discipline thrives in public.

Basically.. cheat.