(Sorry, completely missed your bit about being eligible for a NAFTA work permit.)
You should definitely go for it, check the box for "change you conditions" on the form, and then if the applicaiton is still in process when your current permit expires, you will ikely be considered on "implied...