After you file

Yes ... that would keep you from having to deal with the painful form 2210. Any refund can always be applied to the first estimate of the next tax year and you can adjust the next year's estimates accordingly.