Piracetam I think fits the bil lhere. Makes you feel focused, productive and generally "on the ball", and for me there is a definite mood lifting effect. It's not stimulating like coffee though, it won't significantly wake you up, for me its more just like it's turned my brain up a notch. Another one that would fit is a small dose of methamphetamine - it's a tad stronger than caffiene, and if caffiene isn't giving you the effects you want anymore, methamphetamine is guaranteed to do so. There is a DEFINITE mood lift, along with a huge increase in focus and productivity, and it wakes me up better than any other substance I've ever tried, so you might want to give it a shot. However, I'd try piracetam first, as methamphetamine is relatively pricy and may have some side effects.