Most people would suggest dropping all caffeine, yes. That is pretty hard to do though. I think AntM1564 actually has the will power do it, and can speak on it.
I get pretty bad headaches when I stop all caffeine, so I usually give in. I would suggest stopping any fat burners or stimmed preworkouts for 4 weeks. That will give your body sometime to get back to normal.
Try something like Powermax XT if you want a stim free preworkout. It will give you some pump, and your daily ergogenics like Creatine, Betaine, COP, etc.
Then after the break, running products like OxyMax XT will feel brand new again lol.