That seems to be the best option for resolving it. I was worried if I change the 1099-R fields it wouldn't match what the IRS received - but this is the correct interpretation of what happened so I think I will change the 2b box from $2005 to $5 manually and provide the explanation that you mention. Thanks for all the help folks!!!
