After you file

"...Which is right? ..." 

Very simply:   It all depends on WHY you amended and WHAT you changed
Also, you should NOT AMEND your return UNTIL your original return has been accepted, then it is best to wait a few more days until you actually received your refund, or your payment check is cashed by the IRS.

Then you can properly prepare your amended return (using the amounts that you and the IRS agree on at the time of the original return).  The amount shown as the 'NEW' refund (or payment due) is the result of your amended return.

Trying to prepare an amended return before your original return is accepted could end up frustrating you.