I really hope he doesn't compromise on his goals just to spend more time with the girls. It was already established that he doesn't really have enough money to study, so it would be hard to believe if he went back to his old class with some argument like "eh, I'll manage somehow anyway". But that's probably what will happen, this kind of manga isn't very likely to permanently change its setting 40+ chapters in.