On the 8889 you need to mark the Family of Self box in the Smart Worksheet below the top line (just marking the box on that top line, doesnt do what you need)  and be sure you DON'T enter any contributions on the 8889 that were made through payroll, those should come from the W2 entry, you dont enter them again anywhere.