Ugh, that's the worst. What I do is manually go into the 1099-INT screen for that same payor, decrease the regular interest by the market discount amount, increase treasury interest by the market discount amount, and make a bunch of notes.