If you know the client is going to file an extension for May 17th, add the 1st qtr estimated tax payment to the extension amount and don't worry about the April 15th deadline.  Just carry over the overpayment to the 2021 return and it will be covered.  Or if they don't owe for their extension, the same procedure will still work.