Avoiding clicks in a pitch modulated delay line

I've got a simple delay line as part of a bigger patch I've been working on and it has some delay time modulation. I started with a triangle lfo - no problems there. Then I wanted some variety, so I added the ability to skew the triangle to an up/down ramp, to reset the lfo, and to latch/sample-and-hold the modulated delay time. And of course all of these generate clicks in the signal. I can avoid the clicks when engaging the latch/sah by using the delay_morphed_times_no_pitch_change patch from the GO book to crossfade between delay taps when the delay time change occurs. But I'm stuck on how to adapt the patch to avoid the clicks caused by the ramps and lfo reset and also keep the pitch modulation. Maybe latch the delay time of one tap right before the sharp change occurs, then crossfade over after somehow? I haven't figured out how to do that yet.