Congrats for kicking the habit, but to anyone that likes being addicted to caffeine and wants to save money, you can buy natural sources of caffeine such as kola, guarana, and yerba mate very cheaply online.
I second the mate. I love espresso and would drink it all day if I could, but it often leaves me feeling dehydrated.
Mate has mateine, by the way, not caffeine (mateine is a stereoisomer of caffeine). I don't know it has different properties and that's the reason or if it's the plethora of other constituents, but in my experience mate gives me a mild, persistent buzz all over my body as where caffeine goes straight to my head.
I hadn't followed it through to the source when I posted the Wikipedia link. That was a pretty cool little paper one of the mysterious admins of erowid wrote.