Best thing to do is to e-file now without 2210 and let IRS figures that out for you later and send you a bill with no additional late payment. And that's what I did!
