I like the english idea of small amounts of weak tea during the day for cafeine vs. the megablast followed by dehydration and a crash. I switched from DARK coffee to 2-3 cups of green tea a day, the L-theanine in the green tea is good to keep the jitters away.
Atleast you didnt get suckered into the Provigil/Ritalin crap. Try Korean Ginseng (Panax)
small amounts of l-phenylalanine and excercise, it may not get you wired but it makes me clear in the head.