Reporting fellowship

[ILLMAS]

TP graduated college in May 2022

1098-T as follows:

Box 1 26,000
Scholarships 20,000

TP only paid $4000 out of pocket, TP qualifies for AOC on the $4K.

TP in July starts a fellowship (non education related) and earns $20,000 and receives a 1099NEC.

In the past the $20,000 would go on 1040 line 1 SCH, but now it should appear Sch 1 line r.

My question is do I have to mix the 1098-T with the 1099 to show the $20,000 on line r and the TP loses the AOC credit for the $4,000?  

Thanks