really need advice!!

Right now I go to college and I work I work at a gas station on the weekends from 11pm-7am and a whole back my boss who is awesome got fired and ever since I've felt like the new boss wants me gone due to a complicated school schedule, well the old boss has a new job and she wants me to come and work for her, it would be at another gas station but I would not be working over nights any more, she will work around my school schedule and she is the only boss I've had who praises their employees and makes them feel appreciated, but I've been with my current job almost two years, I'm torn, I hate working overnight but i don't know if it is right to leave.