"you may need to amend it AGAIN to remove the 1/3 of the 1099-R."

That's a good point. Since the distribution was in 2020, we are half-way into that third year right now. I would find out when he intends to make any payment and for how much, to take that into consideration for the amendment you would be preparing now.