If you renew your re-entry visa now, it will be co-terminus with your work permit (visa will have the same expiry as the work permit). So if you need to renew your passport, do it soon. Then apply for a new WP then a new visa. When is your passport expiring?