Thank you very much for your detailed response and patience. I think I will make the change to the distribution code in 1099-SA and go ahead and submit my tax return.
