So I found the Breakthrough Photography UV filter worked fine on my RF lenses when working in dusty/dirty/smoky/windy environments. I don't use filters otherwise. I found that when I had the lens filtered in those environments, I didn't have any more intrusion issues.
I'm now happily using the internally focusing 24-105 f2.8 so hopefully the problem is also solved with the upgrade.