I had similar experiences and started cutting my coffee with decaf. I’ve gotten down to a half and half ratio now.
Will typically drink 2 cups in the morning and an espresso immediately following lunch.
I’ve noticed a big difference. I rarely get jittery unless I’ve drunk no water in the morning.