Dunno if it may help your situation.
But as a consumer of many cups of tea whilst sat on my arse at work every day, I switched to decaf tea a few months back and it has made me feel a lot more energetic, which is weird.
Took me few days to get used to the lack of caffeine, but probably in terms of 'diet' it's one I'd recommend.
I now wake up feeling more refreshed, not craving that first cuppa to wake the mind/body.