Don’t take this the wrong way, as I know you said you saw the potential issues so I want to comment on both outcomes. I am criticizing the position RT left things, not your ideas. I think you are just doing the best with that you had.
A common thing I notice about your ideas is a return to The Beacon academy status quo, right? I agree that would be ideal. That’s when the show was at its best. I think Japan liked it too when it was basically a high school anime.
But heres the issue. It’s no longer possible. Our main leads. except Ruby, are pushing 19-20 years old. And they alrady have their huntress licences so they basically have gradauted from their equivalent of collegee. Miles and the others shoot themselves on the foot with, yet another, retarded decision.
Return them to the Beacon Satus Quo, in a single volume, would require so much explanations, retcons and breaking suspension of disbelief, that you might as well reboot the show. As they should.