Retirement tax questions

Yes you are right on the $84k. 
Yes file again and write amended on the corrected form. You also need to send a copy of the original form with the error. 

Use this address for this mailing 

 

Internal Revenue Service Center

Attn: E&G, Stop 824G

7940 Kentucky Drive

Florence, KY 41042-2915