I can't tell you what to do. Honestly, it sounds like your mind is already made up.

But if I were in your shoes, I would want to do both. So I would schedule next semester classes to be in the evenings OR I would strike up a deal with the new employer to change my hours around slightly.