So did you finally enter Canada using S1 visa and work permit ?
I had a similar situation like you. My S1 visa is good till 2018, but I will change my status from study permit to work permit soon. My guess is I have to apply for a new visa based on my work permit, but not 100% sure.