You are correct, you will receive the Recovery Rebate Credit as a refund.
For your amended return to be complete, Form 1040X line 16 should show the amount of tax paid with your original return.
As you are amending your Federal return only for the Recovery Rebate Credit (a Federal credit) there is no reason to amend any state return you have.
