All of the options you mentioned have their advocates. The problem this year with an amended return is that it can take 6-9 months to process and by that time the IRS might have already corrected your return. It’s your call, but I personally would let the IRS correct it. I’m not claiming that is the “right “ choice, just my opinion.
