"It is not necessary to amend until you receive the 1099-R next year."
If you wait, you will find that the 1040-X e-File window has closed.
Unless the tax software gets a major upgrade to e-File prior year amendments.
I wouldn't count on that happening.
