Resident J1 & J2

Hello,

Me and my spouse entered US in Oct 2017 with J1 and J2 visa. We have now pay taxes for 2020.

For the first 2 years (calendar for state and 2 real year for federal) I had a tax exemption. So I started paying on my salary State in Jan 2019 and  Fed in Oct 2019.

I received a W2 with a blank in the wadge box (not blank for social security and medicare tax witheld). I also got a 1042s with code 19, expemption code 04 et 16; tax rate 0, 0 federal tax whithheld and non blank value for my gross income.

My spouse working at another place just received a refular W2 with non blank cases.

 

We used springtax the past two years and now have to swich to turbotax because we are resident for tax now.
Should I enter both 1042s (with precedure explained here) and my W2? Because when I do that I have to pay thousand of unpaid and underpay taxes which is weird because I already pay some on my salaray.

Where should I mention these paid taxes and my tax treaty?