On the delay... go as high as 20ms or even a nudge higher. But keep the delayed signal low enough so that it's not noticable. Maybe you've kept the delayed too wet and that's why you're not liking it. Some delays have a low pass or high rolloff filter. Use that to cut the highs of the delayed signal. You can roll off everything above 3K and have it sit much better. A subtle, semi-dark, delay can do wonders. But yeah I think you need to retrack first.
I listened on Winamp. I'm not sure where the time markers are in your playback system, but I'm positive the pop and timing problems are there.
