Deductions & credits

I haven't yet filed my tax return for 2020. According to IRS website, Tax Day for individuals extended to May 17. 

I am in a dilemma whether to, (1) file the tax return with the excess advance premium tax credit repayment amount now and then send later an amended tax return for a refund, or (2) simply wait until extended tax deadline (May 17) for TurboTax to update the forms to include the changes in the American Rescue Plan.