When I first arrived I was on visit visa for a few months and also had a temp license. If memory serves, you can just go back into the traffic dept with your new visa renewal (take a copy as well) and your expired license and I think they just renew without all the forms.