You can apply for your work permit renewal even the same day of the expiration.
In any case (even if you apply immediately) you are going to fall in the "implied status" due to the processing times.
At this point I can only suggest you to wait until, lets say, beginning of June and then, in case...