Coffee and dairy is pretty known for this effect. It seems like you're dealing with
Really well. The I thing I Have work best for me is putting a small amount of something in my stomach before the coffee, like a half price of toast or some fruit.
I dunno if this is the type of fix you're, looking for, since it doesn't change much to what you're already doing, but I find it effective since I don't like to eat much in the morning