I had similar symptoms. Much less now. Have you considered looking into whether you have silent reflux? Or lowering acid in your diet as a test (so Tata citrus, tomatoes, chocolate, vinegars, raw onion and garlic).