Are the clicks that Waves Tune causes throughout the clip, or just at the ends? If only at the ends, try to select with the clip ends in blank areas so you can cross-fade
You could also create a Track Preset with Melodyne and bus routing all done to make the job easier when you need it
