Hey sorry not been on Slack for a while! I can confirm after removing the font variables from my heading-style-h1, 2,3 etc. I do not get the duplicated class names anymore.
Unfortunately I can't share a read only link at the moment due to an NDA with the client. But perhaps once I'm done with the project I'll make an MRE for you if that's helpful?