This sounds like a good solution. I basically had tried this by entering two separate 1099Rs for Schwab with one being the return of excess Roth Contribution and the other being AE. I also used the codes you mentioned. It did work. But the solution you provided seems more appropriate. Thanks for all who answered for their time.
