I am having the same issue.  If you put the medical costs on schedule A the diagnostic goes away but it makes the distribution taxable. If you put it on the Schedule A and the HSA screen, the diagnostic comes back. I have not been able to find a workaround. Very frustrating.