It's not an option to go with the three-years; it's the default. Yes, you need to amend 2020, if there was a 1099-R that was overlooked.
