My S21 finished junior year with a 2.5 (on an upward swing like you) and finished senior year with a 2.7 after a great senior year. No test score. Lots of options for you if geography is flexible.
Look at state universities with set acceptance standards. You can find them on the school websites. Schools like Wichita State, U Montana and Montana State, Mizzou, West Virginia. All possible and in great college town locations.
Many smaller schools will like your story as well. If you want suggestions there, let me know.