Hello @t_grey,
This is a great effect ! I adopt it 
I just plug it after my morpheur synth with Cabbage patcher…
There is one liitle error in your code line 456 : an extra $ at $$W_SAW
elseif (ishape==$W_TRIANGLE) || (ishape==$W_SQUARE) || (ishape==$$W_SAW) || (ishape==$W_RSAW) then
Hope this helps.