The suggested workaround will correct the miscalculation of missing QCD; but I am afraid it will invite an audit since the IRS screening AI will be looking for two 1099 R and if it sees only one, it will invite an auditor to look over. It can be explained but it is just more hassle.
