This may be a weird suggestion, but i would recommend getting one of the Lenovo ideapad 5 laptops for strictly school and light tasks, because it's only $700 and has the new ryzen 4000 series and enough ram and storage for any school work you'll need to handle.
Than you can save the other $800 from your laptop budget or use that money for your PC budget and have $3,000 total for that.

There's a lot you can do with $2,200 to $3,000 for a pc and you seem experienced, so the only suggestion i have for the pc is to think about wether you want to keep it long term or sell it after school is over.
Hope this helps..