Thanks.  I don't know about the OP, but I tried a simple entry of 1099-SA code 2 for the corrective distribution and entries on the 8889-T for the contributions but couldn't get it to work without overrides.  You might also pull up 2017 and make the same entries there for comparison.