Maybe try increasing the air flow to the goggles/inside helmets. I always amazed in the advancements
made in flowing air inside helmets. Solves lots of problems. Maybe there is some sort of scoop or fan
system for forced flow? My latest helmet you can feel the breeze hitting the visor. Pinlocks work too
if you went to a goggle-less system. But might be hotter yet. Nothing that money can't fix.