Ask HN: How do I make programming less frustrating?

I find I spend a lot of time procrastinating on the bits that are frustrating to deal with. For example, I try to make a little change that should take 10 minutes, but it ends up taking hours, and I procrastinate even more in dread of dealing with it. What is a good way to reduce the frustration, whether it's psychological or technical?