What a great perspective and tool to use for habits and tasks!
You hinted at the idea of preparation at the end. Could you add the idea of 'preparation drafting'? My one idea related to this has to do with running or really any type of exercise. Let's say you decide you want to get up early and get in a run or workout before work. Well, the night before you get all of your run/workout gear ready and laid out (including shoes) beside your bed so that you, as you said, link getting up to running/working out. The idea being that going to bed becomes synonymous with getting prepared for the morning activity as does waking up with the act of working out in the morning.