report both.
each on its own 1099-r
the codes and amounts in box 2 should determine the taxability.
not sure what TT version you are using. some may not accommodate retirement distributions.
