I would feel comfortable either way 
And would probably move Cupido since he is a teacher....
Possibly why not do some class stuff like what zelosse said then skip to after the games to have both some character development and to continue the story along for as long as possible?
Just an idea

I would definitly hop into a revamp of this sadly dies as well