I'm thinking that is the best way. I did enter both last year... since it was an RMD but one that was a charitable contribution. I'm thinking the IRS did not see it as a QCD because of that.
