Scholarships, 529 Plan, and Newly Independent Graduate

In November, 2023, we paid our son's tuition for Winter 2024, and also received reimbursement from the 529 Plan that we had established for our son (the beneficiary).  In March 2024, our son received a $6,000 scholarship for Winter 2024, which was sent to his university.  His university sent us (his parents) a $6,000 refund check in March 2024 with the description Winter 2024.  We immediately re-contributed the $6,000 refund to our 529 plan for our son.  Further complicating the situation, our son graduated, became employed, and will not be our dependent for 2024 tax purposes.  He received a 1098-T with $0 in Box 1 (Payments received for qualified tuition and related expenses), $0 in Box 4 (Adjustments made for a prior year), $6,000 in Box 5 (Scholarships or grants), and $0 in Box 6 (Adjustments to scholarship or grants for a prior year).  How should we handle this in TurboTax on our son's taxes and on our taxes so that his $6,000 scholarship, which was used to cover part of his tuition, is not seen as taxable income?  How should we handle the 2024 re-contribution of $6,000 to our 529 plan for 2024 tuition reimbursed in 2023?  We did not receive a 1099-Q for our son's 529 plan this year, as we had no withdrawals.  Do we need to file an amended 1040 for 2023?  The $6,000 scholarship/re-contribution was far less than the tuition we paid in 2023, and would not result in any taxable income for us or our son.  Thank you for your help!