No, you do not have to wait until you make your payment on April 15 to file an amendment to your tax return that has been accepted by the IRS.
The link below has information of filing an amended tax return that you may find useful.
https://ttlc.intuit.com/replies/3288565
