I think you got it right. It took evolution many tries to make you lazy with a taste for sugar - don't fight it head on.

Be smart about your environment and make the habits you desire so easy to maintain that you won't need self control to stick with them.