Cincybev,

Did the headaches start at about the same time you made the changes? If so, then it is probably withdrawal from the caffeine and aspartame. But, if you cut down when you started in mid-May, they should have subsided by now.

Headaches upon wakening is a classic symptom of sleep apnea. You might want to get checked out if the headaches continue.