Swapped out the Compare2 for a uTides2. As much as I love the stereo PWM from Compare2, I just didn't see a need for all the trigger generation in this case (or for this concept). The uTides2 offers up LFO, envelopes, as well as sub-harmonic generation. Gain staging in this case has been manageable so far with the mixing and attenuation I included.
Using Maths to square off the Tides waveforms works well. Modulating the smooth parameter to just slightly fold the Tides output pre-squaring adds some nice grit.
Comments and suggestions are welcome.