My brother just came back from japan and brought me two canisters of apparently the best green tea he could find (I wonder if he did get jipped over there) but they smell and taste divine!
I think you need to take a BREAK from stimulants altogether. Slowly reduce your intake, even look at PAL's Reset AD. It is difficult at first, and you might feel crappy or headache-y but it'll be...
Well I hope you do end up using it for a longer period to see how it works. As I said before, everyone's tastes are different, but the overwhelming response has been positive for the java scent.