Sinced you hold a valid work permit, just apply for a multiple entry visa under the new work permit. That will help you get rid of the hassle, since you are under a work permit, logically your study permit is finished since u graduated...so it's better you apply for a multiple entry visa.