I’m marking this as done.
I’ve not had any form of caffeine, nor wanted any for quite a while and fully intend to cut it from my diet entirely. I normally have the odd cup of normal tea amongst several herbal each day, and I think that’s what causes the problems. I’ve realised I don’t crave coffee if I’ve only had herbal tea. Simple really, I feel silly for not thinking of it before.