Thanks @Michael_R , I think I’m ok for now - long story short I swapped my '17 freehub with the latest version wahoo sells. I had to make my own tool to get the ring off that the pawls glide against, but once that was done the new freehub worked fine, and it came with new shims (which will wear out…).
I made the tool out of a schedule 40 pipe connector, surprisingly worked well.