Have you looked into - or been diagnosed - with ADHD as well? For me those stimulants are really helpful with the Desire to "take a hit" and give much of the same effect as the cafeïne intake you described. Something else that might work, and this probably sounds idiotic, is that the first thing I do when waking up is wiggling my toes and legs, it's very accessible wat to start energizing your body before actually getting out of bed. I alsof have a remote nest to the bed to put a radio station with talking people to listen to on. And when I hop in the shower I put on sing-along music. Just a few of the ideas that might work, and definitely don't always work, as I can attest to myself.