Yeah, if they want to keep Peter in high-school....these films are going to have to fall out sync with the MCU timeline pretty quickly (as they've started to do already, with Homecoming taking place immediately after Civil War), By the time Spider-Man 3 comes around for Peter's graduation year, he's probably going to fall around five years behind what's going on with the more current MCU films in relation to the in-universe timeline.