How do I report my scholarship and the federal withholdings already applied to it, having received a 1042-S and a 1098-T that do not match?

I am a graduate student on an F1 visa; this is my first year filing as a resident alien (entered the country in Aug. 2013 as a J1 student).

For 2018 I have received a W-2, a 1042-S (code 16), and a 1098-T. The 1042-S and the 1098-T are supposed to report my scholarship; but they show different amounts (the 1042-S shows the entirety of the scholarship I have received; the 1098-T shows only a part). Moreover, the 1042-S shows that a good amount of money was withheld from my scholarship for federal taxes.

Here is what I have done:

1) I have entered my 1098-T just as I have gotten it;

2) I have entered the difference between the amount reported on the 1098-T and the one reported on the 1042-S in the "Other Scholarships/Grants/Fellowships" box of the "Did You Receive a Scholarship or Grant in 2018?" section;

3) I entered the amount that was withheld from my scholarship, as reported on my 1042-S, in the "Federal Withholdings" box of the "Other Income Taxes Paid in 2018."

The Federal Refund I am getting is quite substantial, but am I following the right procedure?

Thanks. G.