The problem with doing "big time" workouts during a competitive HS season is that most teams are already racing once a week anyway and that is likely to be the big effort for the week.
From the looks of it, the Michigan wasn't too hard of an effort (based on the ability to drop a 61 on the last 400). So, good, you didn't run it too hard.
As far as the cut down 800s go, same thing. It looks like you accomplished what you wanted to do in the workout. In both cases, you got over 4 miles of quality running. If those workouts weren't too hard, then they should support your racing goals just fine.
Depending on the course, I'd say you're 16:30-16:40.