Just wanted to be sure I was doing this right. Yig Curses you at the start of battle, so you don't roll for the Curses during your upkeep on the first round of combat. You do, however, begin rolling for the Curses at the second round's upkeep, right?

Yes, that's correct.