You'd think that maybe the IRS computers would be smart enough to "see" a 1098-T and a 1099-Q for the same student and put two and two together.  But that hasn't been my experience, and it sounds like not yours either. 😞

You could try throwing in on Line 21 as in and out.  Some one at the IRS actually looks at those . . . right after you send them a letter replying to the CP2000 and telling them that you already reported it on Line 21 . . .