maybe swith to another PPI. There are many others in the class, such as Prilosec (don't go OTC...that dose is 1/2 the Rx dose.... get Rx if this is the way you want to go), Nexium, Aciphex, or Protonix.
You can also up the dose of a PPI as well.
Finally, consider taking Tums or another anti-acid on top of your daily PPI. That could help.
But check out your HbA1c for your CFRD.... there might be something to your mouth troubles there. CFRD is progressive as well, so if you were borderline last time you were checked, you might be worse now.