Agreed. I actually have found that the kind of high I get from caffeine greatly depends on the source it comes from.
For me, coffee is drastically inferior to the high I get from earl grey tea (most black teas in general). I find that with tea the high is much smoother and lasts longer; if you can imagine a bell curve, it would be wider and with a smaller amplitude, whereas coffee would be narrower and with a taller amplitude.
Also, I've found a 20 minute nap at mid-day with green tea afterwards (about half the caffeine content of my morning breakfast tea) to be much more effective in improving cognitive performance than to skip the nap and rely solely on caffeine. For the rest of the day I'm caffeine free.
</personal-experience-disclaimer>