As far as audio hiccups went, I would try encoding it several different times, each time maybe overlapping audio clips more and more and fading them into one another until audio pops disappeared. Still, most of my methods seem like cheats. But it works for me since I'm not an audiophile.
