After you file

@fanfare 

Your advice gave me the impetus to go back through the Form 1099-R interview process. That proved to be the solution. The return is now completely correct including everything on Form 8606.

Your assistance made this possible. 

Thank you!