Found a source for these, nothing fancy (Bussmann USA) not Hella, SWF or NOS VW but a direct replacement for the round aluminum ones that ground through the body of the flasher and have three tabs (+, switch, and indicator light in the dash that can be connected or not)...
Ordered a couple spares in case anyone else is in the same predicament trying to get things working.
Steve